* libc/argz/argz_create_sep.c (argz_create_sep): Initialize *argz_len

	to zero.
	* libc/include/argz.h: Guard against multiple inclusion.  Guard for
	use with C++.

1 files changed, 11 insertions, 0 deletions

diff --git a/newlib/libc/include/argz.h b/newlib/libc/include/argz.h
index 76afc062d..02c9adbf3 100644
--- a/newlib/libc/include/argz.h
+++ b/newlib/libc/include/argz.h
@@ -4,9 +4,16 @@
  * is freely granted, provided that this notice is preserved.
  */
 
+#ifndef _ARGZ_H_
+#define _ARGZ_H_
+
 #include <errno.h>
 #include <sys/types.h>
 
+#include "_ansi.h"
+
+_BEGIN_STD_C
+
 /* The newlib implementation of these functions assumes that sizeof(char) == 1. */
 error_t argz_create (char *const argv[], char **argz, size_t *argz_len);
 error_t argz_create_sep (const char *string, int sep, char **argz, size_t *argz_len);
@@ -20,3 +27,7 @@ error_t argz_delete (char **argz, size_t *argz_len, char *entry);
 error_t argz_insert (char **argz, size_t *argz_len, char *before, const char *entry);
 char * argz_next (char *argz, size_t argz_len, const char *entry);
 error_t argz_replace (char **argz, size_t *argz_len, const char *str, const char *with, unsigned *replace_count);
+
+_END_STD_C
+
+#endif /* _ARGZ_H_ */