From 9c7a001a2631b7603883cacfb470ec58a472efcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Tue, 16 Aug 2016 07:01:21 +0200
Subject: [PATCH] New pgp-encode helper function, write_string.
---
ChangeLog | 3 +++
pgp-encode.c | 16 ++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
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'));
}
--
GitLab