From d91e8faf19008e04bfe12eb461a05c7d6455c14a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sun, 6 Oct 2002 21:12:36 +0200
Subject: [PATCH] (sexp_iterator_init): Made this function static.
(sexp_iterator_first): New, friendlier, initialization function.
Rev: src/nettle/sexp.c:1.5
Rev: src/nettle/sexp.h:1.4
---
sexp.c | 12 +++++++++++-
sexp.h | 12 ++++++------
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/sexp.c b/sexp.c
index 3c653548..112b694b 100644
--- a/sexp.c
+++ b/sexp.c
@@ -28,7 +28,9 @@
#include <stdlib.h>
#include <string.h>
-void
+/* Initializes the iterator. You have to call next to get to the first
+ * element. */
+static void
sexp_iterator_init(struct sexp_iterator *iterator,
unsigned length, const uint8_t *input)
{
@@ -46,6 +48,14 @@ sexp_iterator_init(struct sexp_iterator *iterator,
* skip white space here. */
}
+int
+sexp_iterator_first(struct sexp_iterator *iterator,
+ unsigned length, const uint8_t *input)
+{
+ sexp_iterator_init(iterator, length, input);
+ return sexp_iterator_next(iterator);
+}
+
#define EMPTY(i) ((i)->pos == (i)->length)
#define NEXT(i) ((i)->buffer[(i)->pos++])
diff --git a/sexp.h b/sexp.h
index bf0d9adb..15160377 100644
--- a/sexp.h
+++ b/sexp.h
@@ -51,13 +51,13 @@ struct sexp_iterator
};
-/* Initializes the iterator. You have to call next to get to the first
- * element. */
-void
-sexp_iterator_init(struct sexp_iterator *iterator,
- unsigned length, const uint8_t *input);
-
/* All these functions return 1 on success, 0 on failure */
+
+/* Initializes the iterator. */
+int
+sexp_iterator_first(struct sexp_iterator *iterator,
+ unsigned length, const uint8_t *input);
+
int
sexp_iterator_next(struct sexp_iterator *iterator);
--
GitLab