* libmisc/cleanup.c: Fix del_cleanup. The arguments were not

	desynchronized with the cleanup functions.
	* libmisc/cleanup.c: cleanup_function_args is an array of void
	pointer, not strings.

diff --git a/ChangeLog b/ChangeLog
index ee561d606bb651c32c7a34ce252e17392391ccd8..0608a7f498d9fffcd8e44fb4831bd1c067db5ebb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-15  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * libmisc/cleanup.c: Fix del_cleanup. The arguments were not
+       desynchronized with the cleanup functions.
+       * libmisc/cleanup.c: cleanup_function_args is an array of void
+       pointer, not strings.
+
 2009-03-15  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/find_new_gid.c: Fix find_new_gid() the current group

diff --git a/libmisc/cleanup.c b/libmisc/cleanup.c
index b339a7e90f864cfbe570025a7569de2b2c4bf9b8..963c652da12c9bc01be19a57532eae39c985cb4e 100644 (file)
--- a/libmisc/cleanup.c
+++ b/libmisc/cleanup.c
@@ -39,7 +39,7 @@
  */
 #define CLEANUP_FUNCTIONS 10
 static cleanup_function cleanup_functions[CLEANUP_FUNCTIONS];
-static const char * cleanup_function_args[CLEANUP_FUNCTIONS];
+static void * cleanup_function_args[CLEANUP_FUNCTIONS];
 
 /*
  * - Cleanup functions shall not fail.
@@ -113,8 +113,10 @@ void del_cleanup (cleanup_function pcf)
 
                if (i == (CLEANUP_FUNCTIONS -1)) {
                        cleanup_functions[i] = NULL;
+                       cleanup_function_args[i] = NULL;
                } else {
                        cleanup_functions[i] = cleanup_functions[i+1];
+                       cleanup_function_args[i] = cleanup_function_args[i+1];
                }
 
                /* A NULL indicates the end of the stack */