(format_length_string): Deleted function.

(format_string): Deleted function.
(sexp_vformat): New %t specifier, formatting an optional display
type. Deleted %z specifier. Instead, introduced a new modifier "0"
that can be used with %s, %l and %t, which says that the data is
NUL-terminated.

Rev: src/nettle/sexp-format.c:1.5
Rev: src/nettle/sexp.h:1.11

1 files changed, 13 insertions, 3 deletions

diff --git a/sexp.h b/sexp.h
index 7baee5b8..aa86db24 100644
--- a/sexp.h
+++ b/sexp.h
@@ -137,10 +137,12 @@ struct nettle_buffer;
  * Format strings can contained matched parentheses, and the following
  * formatting specifiers:
  *
- *   %z   NUL-terminated string, const uint8_t *.
- *
  *   %s   String represented as unsigned length, const uint8_t *data.
  *
+ *   %t   Optional display type, represented as
+ *        unsigned display_length, const uint8_t *display,
+ *        display == NULL means no display type.
+ *
  *   %i   Non-negative small integer, uint32_t.
  *
  *   %b   Non-negative bignum, mpz_t.
@@ -148,7 +150,15 @@ struct nettle_buffer;
  *   %l   Literal string (no length added), typically a balanced
  *        subexpression. Represented as unsigned length, const uint8_t
  *        *data.
- */
+ *
+ * Modifiers:
+ *
+ *   %0   For %s, %t and %l, says that there's no length argument,
+ *        instead the string is NUL-terminated, and there's only one
+ *        const uint8_t * argument.
+ *
+ * FIXME: Allow literals, like "(x%b)". Allow "%(" for unbalanced
+ * parenthesis. */
 
 unsigned
 sexp_format(struct nettle_buffer *buffer,