stagit

commit 3d8d6d841e2a72d3c2ce12ff78b91106d548e308
parent ef5ae04d1e1a60f7ee06972503b7ea3e4d1447cd
Author: Armaan Bhojwani <me@armaanb.net>
Date:   Fri, 16 Apr 2021 11:12:38 -0400

Fix merge

Diffstat:
M
src/stagit.c
 | 
44
--------------------------------------------

1 file changed, 0 insertions(+), 44 deletions(-)
diff --git 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);
 		}
 	}