Finished the bulk of changes for gnupg 1.9. This included switching

to libgcrypt functions, using shared error codes from libgpg-error,
replacing the old functions we used to have in ../util by those in
../jnlib and ../common, renaming the malloc functions and a couple of
types.  Note, that not all changes are listed below becuause they are
too similar and done at far too many places.  As of today the code
builds using the current libgcrypt from CVS but it is very unlikely
that it actually works.

1 files changed, 8 insertions, 12 deletions

diff --git a/include/util.h b/include/util.h
index c3d0189c6..ca5e5e431 100644
--- a/include/util.h
+++ b/include/util.h
@@ -20,6 +20,9 @@
 #ifndef G10_UTIL_H
 #define G10_UTIL_H
 
+#warning oops, using old util.h
+#if 0 /* Dont use it anymore */
+
 #if defined (__MINGW32__) || defined (__CYGWIN32__)
 #include <stdarg.h>
 #endif
@@ -126,9 +129,6 @@ void g10_log_hexdump( const char *text, const char *buf, size_t len );
 #define log_debug_f g10_log_debug_f
 
 
-/*-- errors.c --*/
-const char * g10_errstr( int no );
-
 /*-- argparse.c --*/
 int arg_parse( ARGPARSE_ARGS *arg, ARGPARSE_OPTS *opts);
 int optfile_parse( FILE *fp, const char *filename, unsigned *lineno,
@@ -177,15 +177,9 @@ int answer_is_yes( const char *s );
 int answer_is_yes_no_quit( const char *s );
 
 /*-- strgutil.c --*/
-void free_strlist( STRLIST sl );
-#define FREE_STRLIST(a) do { free_strlist((a)); (a) = NULL ; } while(0)
-STRLIST add_to_strlist( STRLIST *list, const char *string );
-STRLIST add_to_strlist2( STRLIST *list, const char *string, int is_utf8 );
-STRLIST append_to_strlist( STRLIST *list, const char *string );
-STRLIST append_to_strlist2( STRLIST *list, const char *string, int is_utf8 );
-STRLIST strlist_prev( STRLIST head, STRLIST node );
-STRLIST strlist_last( STRLIST node );
-char *pop_strlist( STRLIST *list );
+
+#include "../jnlib/strlist.h"
+
 const char *memistr( const char *buf, size_t buflen, const char *sub );
 const char *ascii_memistr( const char *buf, size_t buflen, const char *sub );
 char *mem2str( char *, const void *, size_t);
@@ -301,4 +295,6 @@ void riscos_list_openfiles(void);
 #endif /* !__RISCOS__C__ */
 #endif /* __riscos__ */
 
+#endif
+
 #endif /*G10_UTIL_H*/