Fix multiple useless C99isms. Should fix the build with GCC 2.95.

Spotted by latest NetBSD 1.6.2/i386 kristerw@'s bulk build.

5 files changed, 137 insertions, 1 deletions

diff --git a/security/gpass/distinfo b/security/gpass/distinfo
index 86a00b48640..10a502d7a13 100644
--- a/security/gpass/distinfo
+++ b/security/gpass/distinfo
@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.4 2004/06/21 07:29:13 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2005/01/13 19:48:50 jmmv Exp $
 
 SHA1 (gpass-0.4.4.tar.gz) = 3b9e91e497cfee2854bef5e42a36fc31874493fb
 Size (gpass-0.4.4.tar.gz) = 415166 bytes
 SHA1 (patch-aa) = 773b024a7a217efbafabe35fbe81e325f9c93589
+SHA1 (patch-ab) = dd89c4f88923a51455f00027ac5ca61d8faf53b1
 SHA1 (patch-ac) = 07d643e195d8c56f502482e743903764a9b17e17
+SHA1 (patch-ad) = e9e2f6a4b7585a65213a3dce444b1639e5d2064c
+SHA1 (patch-ae) = 4c50b757c02d8d7a89805d06d6d0c0f3ec472739
+SHA1 (patch-af) = ffc84f012d7e50281bb0946f6dc41efab809951b
diff --git a/security/gpass/patches/patch-ab b/security/gpass/patches/patch-ab
new file mode 100644
index 00000000000..7a884334265
--- /dev/null
+++ b/security/gpass/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.5 2005/01/13 19:48:50 jmmv Exp $
+
+--- src/app.c.orig	2004-05-03 09:49:36.000000000 +0200
++++ src/app.c
+@@ -81,6 +81,8 @@ static gboolean app_save_yourself(GnomeC
+ 
+ void app_init()
+ {
++    GtkToolbar *toolbar;
++    BonoboDockItem *dockitem;
+     GtkWidget *treeview;
+     gint width, height;
+     gint x,y;
+@@ -99,9 +101,6 @@ void app_init()
+     }
+     glade_xml_signal_autoconnect(xml);
+ 
+-    GtkToolbar *toolbar;
+-    BonoboDockItem *dockitem;
+-
+     toolbar = GTK_TOOLBAR(glade_xml_get_widget(xml, "toolbar1"));
+     g_assert(toolbar != NULL);
+ 
diff --git a/security/gpass/patches/patch-ad b/security/gpass/patches/patch-ad
new file mode 100644
index 00000000000..97b9ca6d9c6
--- /dev/null
+++ b/security/gpass/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.1 2005/01/13 19:48:50 jmmv Exp $
+
+--- src/generate.c.orig	2004-04-27 01:58:50.000000000 +0200
++++ src/generate.c
+@@ -113,6 +113,7 @@ const char *generate_display_dialog()
+     GtkWidget *dialog;
+     char *result = NULL;
+     GtkWidget *checkbutton;
++    int r;
+ 
+     xml = glade_xml_new(PACKAGE_DATA_DIR"/generate-password-dialog.glade", 
+ 	    		NULL, NULL);
+@@ -142,7 +143,7 @@ const char *generate_display_dialog()
+     dialog = glade_xml_get_widget(xml, "generate_password_dialog");
+     g_assert(dialog != NULL);
+ 
+-    int r = gtk_dialog_run(GTK_DIALOG(dialog));
++    r = gtk_dialog_run(GTK_DIALOG(dialog));
+     switch (r) {
+ 	case GTK_RESPONSE_OK :
+ 	    result = generate_password_generated;
diff --git a/security/gpass/patches/patch-ae b/security/gpass/patches/patch-ae
new file mode 100644
index 00000000000..81753cdcb03
--- /dev/null
+++ b/security/gpass/patches/patch-ae
@@ -0,0 +1,55 @@
+$NetBSD: patch-ae,v 1.1 2005/01/13 19:48:50 jmmv Exp $
+
+--- src/passwordfile.c.orig	2004-06-17 16:31:32.000000000 +0200
++++ src/passwordfile.c
+@@ -103,11 +103,12 @@ static int password_file_get_val(encstre
+ 				 gpointer val,
+ 				 GError **error)
+ {
+-    g_return_val_if_fail(error == NULL || *error == NULL, 0);
+-
+     int r;
++    gchar *str;
+ 
+-    gchar *str = password_file_get_line(es, error);
++    g_return_val_if_fail(error == NULL || *error == NULL, 0);
++
++    str = password_file_get_line(es, error);
+     if (!str) {
+ 	g_assert(error == NULL && *error != NULL);
+ 	return 0;
+@@ -138,11 +139,12 @@ int password_file_read_entry(encstream *
+ 			      password_file_entry *entry,
+ 			      GError **error)
+ {
+-    g_return_val_if_fail(error == NULL || *error == NULL, 2);
+-
+     GError *t_error = NULL;
+     size_t desclen;
+     int r;
++    gchar *buf;
++
++    g_return_val_if_fail(error == NULL || *error == NULL, 2);
+ 
+     if (error == NULL)
+ 	error = &t_error;
+@@ -167,7 +169,7 @@ int password_file_read_entry(encstream *
+     if (*error != NULL)
+ 	return 1;
+ 
+-    gchar *buf = g_malloc(desclen);
++    buf = g_malloc(desclen);
+     r = encstream_read(buf, desclen, es);
+     if (r < desclen) {
+ 	if (encstream_error(es))
+@@ -280,8 +282,9 @@ void password_file_create(const gchar *f
+ 			  GError **error) 
+ {
+ 
++    encstream *es;
+     g_return_if_fail(error == NULL || *error == NULL);
+-    encstream *es = password_file_openw(filename, password, error);
++    es = password_file_openw(filename, password, error);
+     password_file_close(es, error);
+ }
+ 
diff --git a/security/gpass/patches/patch-af b/security/gpass/patches/patch-af
new file mode 100644
index 00000000000..e5776f51759
--- /dev/null
+++ b/security/gpass/patches/patch-af
@@ -0,0 +1,33 @@
+$NetBSD: patch-af,v 1.1 2005/01/13 19:48:50 jmmv Exp $
+
+--- src/passwordlist.c.orig	2004-06-17 16:31:32.000000000 +0200
++++ src/passwordlist.c
+@@ -133,10 +133,10 @@ password_list_is_dirty() 
+ static gboolean 
+ password_list_visible (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+ {
++    password_file_entry entry;
+     if (password_list_filter_text == NULL || *password_list_filter_text == '\0')
+ 	return TRUE;
+ 
+-    password_file_entry entry;
+     gtk_tree_model_get(model, iter,
+ 		       COLUMN_TITLE,
+ 		       &entry.title,
+@@ -587,6 +587,7 @@ void password_list_write()
+     GtkTreeIter iter;
+     gboolean has_more;
+     password_file_entry entry;
++    encstream *es;
+ 
+     password_file_backup(password_list_filename, &error);
+     if (error != NULL) {
+@@ -595,7 +596,7 @@ void password_list_write()
+ 	error = NULL;
+     }
+ 
+-    encstream *es = password_file_openw(password_list_filename,
++    es = password_file_openw(password_list_filename,
+ 	    	                        password_list_master_password,
+ 					&error);
+