File amanda-2.6.1p1-newer_glib.patch of Package amanda.549

--- common-src/conffile.c
+++ common-src/conffile.c
@@ -4151,7 +4151,7 @@
     amfree(config_name);
     amfree(config_dir);
 
-    g_slist_free_full(seen_filenames);
+    my_g_slist_free_full(seen_filenames);
     seen_filenames = NULL;
 
     config_client = FALSE;
@@ -5655,7 +5655,7 @@
             break;
 
 	case CONFTYPE_PP_SCRIPTLIST:
-	    g_slist_free_full(val->v.pp_scriptlist);
+	    my_g_slist_free_full(val->v.pp_scriptlist);
 	    break;
 
 	case CONFTYPE_APPLICATION:
@@ -6771,7 +6771,7 @@
 void
 config_clear_errors(void)
 {
-    g_slist_free_full(cfgerr_errors);
+    my_g_slist_free_full(cfgerr_errors);
 
     cfgerr_errors = NULL;
     cfgerr_level = CFGERR_OK;
--- common-src/glib-util.c
+++ common-src/glib-util.c
@@ -107,7 +107,7 @@
     return to;
 }
 
-void g_list_free_full(GList * list) {
+void my_g_list_free_full(GList * list) {
     GList * cur = list;
 
     while (cur != NULL) {
@@ -119,7 +119,7 @@
     g_list_free(list);
 }
 
-void g_slist_free_full(GSList * list) {
+void my_g_slist_free_full(GSList * list) {
     GSList * cur = list;
 
     while (cur != NULL) {
--- common-src/glib-util.h
+++ common-src/glib-util.h
@@ -64,8 +64,8 @@
 
 /* These functions all take a GLib container, and call free() on all the
  * pointers in the container before free()ing the container itself. */
-void g_list_free_full(GList * list);
-void g_slist_free_full(GSList * list);
+void my_g_list_free_full(GList * list);
+void my_g_slist_free_full(GSList * list);
 void g_queue_free_full(GQueue * queue);
 void g_ptr_array_free_full(GPtrArray * array);
 
--- server-src/amadmin.c
+++ server-src/amadmin.c
@@ -1414,7 +1414,7 @@
                 amfree(dumpstr);
 		dumpfile_free_data(&file);
             }
-            g_slist_free_full(file_list);
+            my_g_slist_free_full(file_list);
             break;
 
         case HOLDING_DELETE:
@@ -1432,7 +1432,7 @@
                     error(_("Could not delete '%s'"), (char *)li->data);
                 }
             }
-            g_slist_free_full(file_list);
+            my_g_slist_free_full(file_list);
             break;
     }
 }
--- server-src/amflush.c
+++ server-src/amflush.c
@@ -241,7 +241,7 @@
 		    stralloc((char *)datestamp->data),
 		    g_compare_strings);
 	}
-	g_slist_free_full(all_datestamps);
+	my_g_slist_free_full(all_datestamps);
     }
     else {
 	/* otherwise, in batch mode, use all datestamps */
@@ -390,9 +390,9 @@
 	}
     }
 
-    g_slist_free_full(datestamp_list);
+    my_g_slist_free_full(datestamp_list);
     datestamp_list = NULL;
-    g_slist_free_full(holding_list);
+    my_g_slist_free_full(holding_list);
     holding_list = NULL;
 
     if(redirect) { /* rename errfile */
@@ -583,7 +583,7 @@
 		}
 		chupper = (char)toupper(ch);
 		if (chupper < 'A' || chupper > max_char) {
-		    g_slist_free_full(r_datestamp_list);
+		    my_g_slist_free_full(r_datestamp_list);
 		    r_datestamp_list = NULL;
 		    break;
 		}
@@ -591,7 +591,7 @@
 					   stralloc(datestamps[chupper - 'A']));
 	    } while ((ch = *a++) != '\0');
 	    if (r_datestamp_list && ch == '\0') {
-		g_slist_free_full(datestamp_list);
+		my_g_slist_free_full(datestamp_list);
 		datestamp_list = r_datestamp_list;
 		break;
 	    }
--- server-src/cmdline.c
+++ server-src/cmdline.c
@@ -255,7 +255,7 @@
 	dumpfile_free_data(&file);
     }
 
-    g_slist_free_full(holding_files);
+    my_g_slist_free_full(holding_files);
 
     return matching_files;
 }
--- server-src/cmdline.h
+++ server-src/cmdline.h
@@ -155,7 +155,7 @@
  * the dumpspec list contains a dumpspec with all blank
  * entries, all holding files are returned.
  *
- * Free the resulting list with g_slist_free_full()
+ * Free the resulting list with my_g_slist_free_full()
  *
  * @param dumpspec_list: a list of dumpspecs
  * @returns: a list of holding disk filenames.
--- server-src/find.c
+++ server-src/find.c
@@ -257,7 +257,7 @@
 	dumpfile_free_data(&file);
     }
 
-    g_slist_free_full(holding_file_list);
+    my_g_slist_free_full(holding_file_list);
 }
 
 static char *
--- server-src/holding.c
+++ server-src/holding.c
@@ -565,7 +565,7 @@
 	dumpfile_free_data(&file);
     }
 
-    if (file_list) g_slist_free_full(file_list);
+    if (file_list) my_g_slist_free_full(file_list);
 
     return result_list;
 }
@@ -591,7 +591,7 @@
 	dumpfile_free_data(&dfile);
     }
 
-    g_slist_free_full(all_files);
+    my_g_slist_free_full(all_files);
 
     return datestamps;
 }
--- server-src/planner.c
+++ server-src/planner.c
@@ -431,7 +431,7 @@
 	    amfree(qhname);
 	    dumpfile_free_data(&file);
 	}
-	g_slist_free_full(holding_list);
+	my_g_slist_free_full(holding_list);
 	holding_list = NULL;
     }
     g_fprintf(stderr, _("ENDFLUSH\n"));
openSUSE Build Service is sponsored by