micro-optimization: fputc (function) -> putc (macro/inline function)

[stagit.git] / src / stagit.c

diff --git a/src/stagit.c b/src/stagit.c
index 337529526ce83964a387f404e87e38a2cda322fe..93127ef9bb9dacbdbbf2508a1ea6d597058c68fa 100644 (file)
--- a/src/stagit.c
+++ b/src/stagit.c
@@ -334,8 +334,11 @@ xmlencodeline(FILE *fp, const char *s, size_t len)
                case '\'': fputs("'",  fp); break;
                case '&':  fputs("&",  fp); break;
                case '"':  fputs(""", fp); break;
+<<<<<<< HEAD:src/stagit.c
                case '\r': break; /* ignore CR */
                case '\n': break; /* ignore LF */
+=======
+>>>>>>> 722f836 (micro-optimization: fputc (function) -> putc (macro/inline function)):stagit.c
                default:   putc(*s, fp);
                }
        }
@@ -554,12 +557,12 @@ printcommit(FILE *fp, struct commitinfo *ci)
                xmlencode(fp, ci->author->email, strlen(ci->author->email));
                fputs("</a>&gt;\n<b>Date:</b>   ", fp);
                printtime(fp, &(ci->author->when));
-               fputc('\n', fp);
+               putc('\n', fp);
        }
        if (ci->msg) {
-               fputc('\n', fp);
+               putc('\n', fp);
                xmlencode(fp, ci->msg, strlen(ci->msg));
-               fputc('\n', fp);
+               putc('\n', fp);
        }
 }
 
@@ -827,10 +830,10 @@ printcommitatom(FILE *fp, struct commitinfo *ci)
                xmlencode(fp, ci->author->email, strlen(ci->author->email));
                fputs("&gt;\nDate:   ", fp);
                printtime(fp, &(ci->author->when));
-               fputc('\n', fp);
+               putc('\n', fp);
        }
        if (ci->msg) {
-               fputc('\n', fp);
+               putc('\n', fp);
                xmlencode(fp, ci->msg, strlen(ci->msg));
        }
        fputs("\n</content>\n</entry>\n", fp);