diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2013-03-08 10:51:34 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2013-03-08 10:51:34 +0000 |
| commit | 7887c684adab042fed1bfcba2e91589ecd17c4a8 (patch) | |
| tree | 961839899dce7f75292a08c079f548973bdbd40d /misc/amanda26-server | |
| parent | 85544f2c01be814e0af1ebee1076012e7ed60bb0 (diff) | |
| download | ports-7887c684adab042fed1bfcba2e91589ecd17c4a8.tar.gz ports-7887c684adab042fed1bfcba2e91589ecd17c4a8.zip | |
Notes
Diffstat (limited to 'misc/amanda26-server')
| -rw-r--r-- | misc/amanda26-server/files/patch-common-src::glib-util.c | 19 | ||||
| -rw-r--r-- | misc/amanda26-server/files/patch-common-src_glib-util.h | 9 |
2 files changed, 19 insertions, 9 deletions
diff --git a/misc/amanda26-server/files/patch-common-src::glib-util.c b/misc/amanda26-server/files/patch-common-src::glib-util.c index 1d3b00558e0d..eb92dddcfc54 100644 --- a/misc/amanda26-server/files/patch-common-src::glib-util.c +++ b/misc/amanda26-server/files/patch-common-src::glib-util.c @@ -1,5 +1,5 @@ ---- common-src/glib-util.c.orig 2008-12-01 22:17:19.000000000 +0100 -+++ common-src/glib-util.c 2011-06-25 22:43:28.000000000 +0200 +--- common-src/glib-util.c.orig 2008-12-01 21:17:19.000000000 +0000 ++++ common-src/glib-util.c 2013-02-07 15:54:40.000000000 +0000 @@ -38,26 +38,15 @@ if (did_glib_init) return; did_glib_init = TRUE; @@ -46,7 +46,7 @@ } typedef enum { -@@ -107,29 +107,19 @@ +@@ -107,38 +107,19 @@ return to; } @@ -76,7 +76,16 @@ g_slist_free(list); } +- +-void g_queue_free_full(GQueue * queue) { +- while (!g_queue_is_empty(queue)) { +- gpointer data; +- data = g_queue_pop_head(queue); +- amfree(data); +- } +- g_queue_free(queue); +-} +#endif - void g_queue_free_full(GQueue * queue) { - while (!g_queue_is_empty(queue)) { + void g_ptr_array_free_full(GPtrArray * array) { + size_t i; diff --git a/misc/amanda26-server/files/patch-common-src_glib-util.h b/misc/amanda26-server/files/patch-common-src_glib-util.h index 7e26de023ff5..913e150674ee 100644 --- a/misc/amanda26-server/files/patch-common-src_glib-util.h +++ b/misc/amanda26-server/files/patch-common-src_glib-util.h @@ -1,6 +1,6 @@ ---- common-src/glib-util.h.orig 2011-06-25 22:39:20.000000000 +0200 -+++ common-src/glib-util.h 2011-06-25 22:40:39.000000000 +0200 -@@ -62,10 +62,16 @@ GValue* g_value_unset_init(GValue* val, +--- common-src/glib-util.h.orig 2008-12-01 21:17:19.000000000 +0000 ++++ common-src/glib-util.h 2013-02-07 15:54:27.000000000 +0000 +@@ -62,11 +62,16 @@ * Returns its second (reset) argument.*/ GValue* g_value_unset_copy(const GValue* from, GValue * to); @@ -16,6 +16,7 @@ * 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 g_queue_free_full(GQueue * queue); +-void g_queue_free_full(GQueue * queue); void g_ptr_array_free_full(GPtrArray * array); + /* g_value_compare() does what you expect. It returns TRUE if and |