Fix merge

[stagit.git] / src / stagit.c

diff --git a/src/stagit.c b/src/stagit.c
index 337529526ce83964a387f404e87e38a2cda322fe..cac0251bf4666bd0f49156c9b99d9a260354be95 100644 (file)
--- a/src/stagit.c
+++ b/src/stagit.c
@@ -286,47 +286,6 @@ void
 xmlencodeline(FILE *fp, const char *s, size_t len)
 {
        size_t i;
-
-       for (i = 0; *s && i < len; s++, i++) {
-               switch(*s) {
-               case '<':  fputs("&lt;",   fp); break;
-               case '>':  fputs("&gt;",   fp); break;
-               case '\'': fputs("&#39;",  fp); break;
-               case '&':  fputs("&amp;",  fp); break;
-               case '"':  fputs("&quot;", fp); break;
-               case '\r': break; /* ignore CR */
-               case '\n': break; /* ignore LF */
-               default:   putc(*s, fp);
-               }
-       }
-}
-
-/* Escape characters below as HTML 2.0 / XML 1.0, ignore printing '\n', '\r' */
-void
-xmlencodeline(FILE *fp, const char *s, size_t len)
-{
-       size_t i;
-
-       for (i = 0; *s && i < len; s++, i++) {
-               switch(*s) {
-               case '<':  fputs("&lt;",   fp); break;
-               case '>':  fputs("&gt;",   fp); break;
-               case '\'': fputs("&#39;",  fp); break;
-               case '&':  fputs("&amp;",  fp); break;
-               case '"':  fputs("&quot;", fp); break;
-               case '\r': break; /* ignore CR */
-               case '\n': break; /* ignore LF */
-               default:   putc(*s, fp);
-               }
-       }
-}
-
-/* Escape characters below as HTML 2.0 / XML 1.0, ignore printing '\n', '\r' */
-void
-xmlencodeline(FILE *fp, const char *s, size_t len)
-{
-       size_t i;
-
        for (i = 0; *s && i < len; s++, i++) {
                switch(*s) {
                case '<':  fputs("&lt;",   fp); break;
@@ -554,12 +513,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 +786,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);