Fix merge

diff --git a/src/stagit.c b/src/stagit.c
index 93127ef9bb9dacbdbbf2508a1ea6d597058c68fa..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;
@@ -334,11 +293,8 @@ xmlencodeline(FILE *fp, const char *s, size_t len)
                case '\'': fputs("&#39;",  fp); break;
                case '&':  fputs("&amp;",  fp); break;
                case '"':  fputs("&quot;", 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);
                }
        }