From: Niels Möller <nisse@lysator.liu.se>
Date: Tue, 16 Aug 2016 05:01:21 +0000 (+0200)
Subject: New pgp-encode helper function, write_string.
X-Git-Tag: nettle_3.3_release_20161001~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c7a001a2631b7603883cacfb470ec58a472efcb;p=thirdparty%2Fnettle.git

New pgp-encode helper function, write_string.
---

diff --git a/ChangeLog b/ChangeLog
index 62314bad..36a0ba74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-08-16  Niels Möller  <nisse@lysator.liu.se>
 
+	* pgp-encode.c (write_string): New helper function, replacing...
+	(WRITE): ... deleted macro.
+
 	* examples/io.c (write_data): Renamed, and use const void * for
 	the input data. Updated all callers.
 	(write_string): ... old name.
diff --git a/pgp-encode.c b/pgp-encode.c
index 983d5a23..fc78e7f6 100644
--- a/pgp-encode.c
+++ b/pgp-encode.c
@@ -339,7 +339,11 @@ pgp_crc24(unsigned length, const uint8_t *data)
 }
 
 
-#define WRITE(buffer, s) (nettle_buffer_write(buffer, strlen((s)), (s)))
+static int
+write_string (struct nettle_buffer *buffer, const char *s)
+{
+  return nettle_buffer_write(buffer, strlen((s)), (const uint8_t *) (s));
+}
 
 /* 15 base 64 groups data per line */
 #define BINARY_PER_LINE 45
@@ -357,9 +361,9 @@ pgp_armor(struct nettle_buffer *buffer,
 
   base64_encode_init(&ctx);
   
-  if (! (WRITE(buffer, "BEGIN PGP ")
-	 && WRITE(buffer, tag)
-	 && WRITE(buffer, "\nComment: Nettle\n\n")))
+  if (! (write_string(buffer, "BEGIN PGP ")
+	 && write_string(buffer, tag)
+	 && write_string(buffer, "\nComment: Nettle\n\n")))
     return 0;
 
   for (;
@@ -414,7 +418,7 @@ pgp_armor(struct nettle_buffer *buffer,
     base64_encode_group(p, crc);
   }
   
-  return (WRITE(buffer, "\nBEGIN PGP ")
-	  && WRITE(buffer, tag)
+  return (write_string(buffer, "\nBEGIN PGP ")
+	  && write_string(buffer, tag)
 	  && NETTLE_BUFFER_PUTC(buffer, '\n'));
 }