From 3d8d6d841e2a72d3c2ce12ff78b91106d548e308 Mon Sep 17 00:00:00 2001 From: Armaan Bhojwani Date: Fri, 16 Apr 2021 11:12:38 -0400 Subject: [PATCH] Fix merge --- src/stagit.c | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/src/stagit.c b/src/stagit.c index 93127ef..cac0251 100644 --- 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("<", fp); break; - case '>': fputs(">", fp); break; - case '\'': fputs("'", fp); break; - case '&': fputs("&", fp); break; - case '"': fputs(""", 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("<", fp); break; - case '>': fputs(">", fp); break; - case '\'': fputs("'", fp); break; - case '&': fputs("&", fp); break; - case '"': fputs(""", 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("<", fp); break; @@ -334,11 +293,8 @@ 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); } } -- 2.39.2