launchd-106.10.tar.gz

[apple/launchd.git] / launchd / src / launchdebugd.c

diff --git a/launchd/src/launchdebugd.c b/launchd/src/launchdebugd.c
index 7d746c45cb7090c30be45edbe3aa663c48976113..3c3d238522c1b7460dabf431de4995a5d3216f3f 100644 (file)
--- a/launchd/src/launchdebugd.c
+++ b/launchd/src/launchdebugd.c
@@ -123,25 +123,29 @@ int main(void)
        exit(EXIT_SUCCESS);
 }
 
        exit(EXIT_SUCCESS);
 }
 

+static void launch_print_obj_dict_callback(launch_data_t obj, const char *key, void *context)
+{
+       FILE *w = context;
+
+       fprintf(w, "<i>%s</i>\n", key);
+       if (launch_data_get_type(obj) != LAUNCH_DATA_ARRAY &&
+                       launch_data_get_type(obj) != LAUNCH_DATA_DICTIONARY)
+               fprintf(w, "<ul><li>\n");
+       launch_print_obj(obj, w);
+       if (launch_data_get_type(obj) != LAUNCH_DATA_ARRAY &&
+                       launch_data_get_type(obj) != LAUNCH_DATA_DICTIONARY)
+               fprintf(w, "</li></ul>\n");
+}
+

 static void launch_print_obj(launch_data_t o, FILE *w)
 {
        size_t i;
 static void launch_print_obj(launch_data_t o, FILE *w)
 {
        size_t i;

-       void launch_print_obj_dict_callback(launch_data_t obj, const char *key, void *context __attribute__((unused))) {
-               fprintf(w, "<i>%s</i>\n", key);
-               if (launch_data_get_type(obj) != LAUNCH_DATA_ARRAY &&
-                               launch_data_get_type(obj) != LAUNCH_DATA_DICTIONARY)
-                       fprintf(w, "<ul><li>\n");
-               launch_print_obj(obj, w);
-               if (launch_data_get_type(obj) != LAUNCH_DATA_ARRAY &&
-                               launch_data_get_type(obj) != LAUNCH_DATA_DICTIONARY)
-                       fprintf(w, "</li></ul>\n");
-       }

 
 
         switch (launch_data_get_type(o)) {
         case LAUNCH_DATA_DICTIONARY:
                fprintf(w, "<ul><li>\n");
 
 
         switch (launch_data_get_type(o)) {
         case LAUNCH_DATA_DICTIONARY:
                fprintf(w, "<ul><li>\n");

-               launch_data_dict_iterate(o, launch_print_obj_dict_callback, NULL);
+               launch_data_dict_iterate(o, launch_print_obj_dict_callback, w);

                fprintf(w, "</li></ul>\n");
                 break;
         case LAUNCH_DATA_ARRAY:
                fprintf(w, "</li></ul>\n");
                 break;
         case LAUNCH_DATA_ARRAY: