Clean up white space.

svn path=/trunk/; revision=28271

1 files changed, 281 insertions, 268 deletions

diff --git a/epan/plugins.c b/epan/plugins.c
index 9d27d735f7..06f5e9b061 100644
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -56,7 +56,7 @@
 /* linked list of all plugins */
 plugin *plugin_list;
 
-#define PLUGINS_DIR_NAME	"plugins"
+#define PLUGINS_DIR_NAME    "plugins"
 
 /*
  * add a new plugin to the list
@@ -67,39 +67,43 @@ plugin *plugin_list;
  */
 static int
 add_plugin(void *handle, gchar *name, gchar *version,
-	   void (*register_protoinfo)(void), void (*reg_handoff)(void),
-	   void (*register_tap_listener)(void),
-	   void (*register_wtap_module)(void),
-	   void (*register_codec_module)(void))
+           void (*register_protoinfo)(void),
+	   void (*reg_handoff)(void),
+           void (*register_tap_listener)(void),
+           void (*register_wtap_module)(void),
+           void (*register_codec_module)(void))
 {
     plugin *new_plug, *pt_plug;
 
     pt_plug = plugin_list;
     if (!pt_plug) /* the list is empty */
     {
-	new_plug = (plugin *)g_malloc(sizeof(plugin));
-	if (new_plug == NULL) return ENOMEM;
+        new_plug = (plugin *)g_malloc(sizeof(plugin));
+        if (new_plug == NULL)
+	    return ENOMEM;
         plugin_list = new_plug;
     }
     else
     {
-	while (1)
-	{
-	    /* check if the same name/version is already registered */
-	    if (!strcmp(pt_plug->name, name) &&
-		!strcmp(pt_plug->version, version))
-	    {
-		return EEXIST;
-	    }
-
-	    /* we found the last plugin in the list */
-	    if (pt_plug->next == NULL) break;
-
-	    pt_plug = pt_plug->next;
-	}
-	new_plug = (plugin *)g_malloc(sizeof(plugin));
-	if (new_plug == NULL) return ENOMEM;
-	pt_plug->next = new_plug;
+        while (1)
+        {
+            /* check if the same name/version is already registered */
+            if (!strcmp(pt_plug->name, name) &&
+                !strcmp(pt_plug->version, version))
+            {
+                return EEXIST;
+            }
+
+            /* we found the last plugin in the list */
+            if (pt_plug->next == NULL)
+	        break;
+
+            pt_plug = pt_plug->next;
+        }
+        new_plug = (plugin *)g_malloc(sizeof(plugin));
+        if (new_plug == NULL)
+	    return ENOMEM;
+        pt_plug->next = new_plug;
     }
 
     new_plug->handle = handle;
@@ -131,7 +135,7 @@ add_plugin(void *handle, gchar *name, gchar *version,
 static void
 plugins_scan_dir(const char *dirname)
 {
-#define FILENAME_LEN	1024
+#define FILENAME_LEN        1024
     WS_DIR        *dir;             /* scanned directory */
     WS_DIRENT     *file;            /* current file */
     const char    *name;
@@ -142,187 +146,190 @@ plugins_scan_dir(const char *dirname)
     void         (*register_protoinfo)(void);
     void         (*reg_handoff)(void);
     void         (*register_tap_listener)(void);
-    void (*register_wtap_module)(void);
-    void (*register_codec_module)(void);
+    void         (*register_wtap_module)(void);
+    void         (*register_codec_module)(void);
 
     gchar         *dot;
     int            cr;
 
     if ((dir = ws_dir_open(dirname, 0, NULL)) != NULL)
     {
-
-    while ((file = ws_dir_read_name(dir)) != NULL)
-	{
-	    name = ws_dir_get_name(file);
-
-	    /*
-	     * GLib 2.x defines G_MODULE_SUFFIX as the extension used on
-	     * this platform for loadable modules.
-	     */
-	    /* skip anything but files with G_MODULE_SUFFIX */
+        while ((file = ws_dir_read_name(dir)) != NULL)
+        {
+            name = ws_dir_get_name(file);
+
+            /*
+             * GLib 2.x defines G_MODULE_SUFFIX as the extension used on
+             * this platform for loadable modules.
+             */
+            /* skip anything but files with G_MODULE_SUFFIX */
             dot = strrchr(name, '.');
             if (dot == NULL || strcmp(dot+1, G_MODULE_SUFFIX) != 0)
-	        continue;
-
-	    g_snprintf(filename, FILENAME_LEN, "%s" G_DIR_SEPARATOR_S "%s",
-	        dirname, name);
-	    if ((handle = g_module_open(filename, 0)) == NULL)
-	    {
-		report_failure("Couldn't load module %s: %s", filename,
-			  g_module_error());
-		continue;
-	    }
-
-	    if (!g_module_symbol(handle, "version", &gp))
-	    {
-	        report_failure("The plugin %s has no version symbol", name);
-		g_module_close(handle);
-		continue;
-	    }
-	    version = gp;
-
-	    /*
-	     * Do we have a register routine?
-	     */
-	    if (g_module_symbol(handle, "plugin_register", &gp))
-	    {
-		/*
-		 * Yes - this plugin includes one or more dissectors.
-		 */
-		register_protoinfo = gp;
-	    }
-	    else
-	    {
-		/*
-		 * No - no dissectors.
-		 */
-		register_protoinfo = NULL;
-	    }
-
-	    /*
-	     * Do we have a reg_handoff routine?
-	     */
-	    if (g_module_symbol(handle, "plugin_reg_handoff", &gp))
-	    {
-		/*
-		 * Yes.
-		 */
-		reg_handoff = gp;
-	    }
-	    else
-	    {
-		/*
-		 * No - that's OK even if we have dissectors, as long
-		 * as the plugin registers by name *and* there's
-		 * a caller looking for that name.
-		 */
-		reg_handoff = NULL;
-	    }
-
-	    /*
-	     * Do we have a register_tap_listener routine?
-	     */
-	    if (g_module_symbol(handle, "plugin_register_tap_listener", &gp))
-	    {
-		/*
-		 * Yes - this plugin includes one or more taps.
-		 */
-		register_tap_listener = gp;
-	    }
-	    else
-	    {
-		/*
-		 * No - no taps here.
-		 */
-		register_tap_listener = NULL;
-	    }
-
-		/*
-	     * Do we have an old-style init routine?
-	     */
-	    if (g_module_symbol(handle, "plugin_init", &gp))
-	    {
-			/*
-			 * Yes - do we also have a register routine or a
-			 * register_tap_listener routine?  If so, this is a bogus
-			 * hybrid of an old-style and new-style plugin.
-			 */
-			if (register_protoinfo != NULL || register_tap_listener != NULL)
-			{
-				report_failure("The plugin '%s' has an old plugin init routine\nand a new register or register_tap_listener routine.",
-				name);
-				g_module_close(handle);
-				continue;
-			}
-
-			/*
-			 * It's just an unsupported old-style plugin;
-			 */
-			report_failure("The plugin '%s' has an old plugin init routine. Support has been dropped.\n Information on how to update your plugin is available at \nhttp://anonsvn.wireshark.org/wireshark/trunk/doc/README.plugins",
-				name);
-			g_module_close(handle);
-			continue;
-	    }
-
-	    /*
-		 * Do we have a register_wtap_module routine?
-		 */
-           if (g_module_symbol(handle, "register_wtap_module", &gp))
-           {
-               register_wtap_module = gp;
-           } else {
-               register_wtap_module = NULL;
-           }
-
-	    /*
-		 * Do we have a register_codec_module routine?
-		 */
-           if (g_module_symbol(handle, "register_codec_module", &gp))
-           {
-               register_codec_module = gp;
-           } else {
-               register_codec_module = NULL;
-           }
-
-	   /*
-		* Does this dissector do anything useful?
-		*/
-	    if (register_protoinfo == NULL &&
-		    register_tap_listener == NULL &&
-		    register_wtap_module == NULL &&
-		    register_codec_module == NULL )
-	    {
-		/*
-		 * No.
-		 */
-		report_failure("The plugin '%s' has neither a register routine, "
-					   "a register_tap_listener or a register_wtap_module or a register_codec_module routine",
-		    name);
-		g_module_close(handle);
-		continue;
-	    }
-
-	    /*
-	     * OK, attempt to add it to the list of plugins.
-	     */
-	    if ((cr = add_plugin(handle, g_strdup(name), version,
-				 register_protoinfo, reg_handoff,
-				 register_tap_listener,register_wtap_module,register_codec_module)))
-	    {
-		if (cr == EEXIST)
-		    fprintf(stderr, "The plugin %s, version %s\n"
-			    "was found in multiple directories\n", name, version);
-		else
-		    fprintf(stderr, "Memory allocation problem\n"
-			    "when processing plugin %s, version %s\n",
-			    name, version);
-		g_module_close(handle);
-		continue;
-	    }
-
-	}
-	ws_dir_close(dir);
-	}
+                continue;
+
+            g_snprintf(filename, FILENAME_LEN, "%s" G_DIR_SEPARATOR_S "%s",
+                       dirname, name);
+            if ((handle = g_module_open(filename, 0)) == NULL)
+            {
+                report_failure("Couldn't load module %s: %s", filename,
+                               g_module_error());
+                continue;
+            }
+
+            if (!g_module_symbol(handle, "version", &gp))
+            {
+                report_failure("The plugin %s has no version symbol", name);
+                g_module_close(handle);
+                continue;
+            }
+            version = gp;
+
+            /*
+             * Do we have a register routine?
+             */
+            if (g_module_symbol(handle, "plugin_register", &gp))
+            {
+                /*
+                 * Yes - this plugin includes one or more dissectors.
+                 */
+                register_protoinfo = gp;
+            }
+            else
+            {
+                /*
+                 * No - no dissectors.
+                 */
+                register_protoinfo = NULL;
+            }
+
+            /*
+             * Do we have a reg_handoff routine?
+             */
+            if (g_module_symbol(handle, "plugin_reg_handoff", &gp))
+            {
+                /*
+                 * Yes.
+                 */
+                reg_handoff = gp;
+            }
+            else
+            {
+                /*
+                 * No - that's OK even if we have dissectors, as long
+                 * as the plugin registers by name *and* there's
+                 * a caller looking for that name.
+                 */
+                reg_handoff = NULL;
+            }
+
+            /*
+             * Do we have a register_tap_listener routine?
+             */
+            if (g_module_symbol(handle, "plugin_register_tap_listener", &gp))
+            {
+                /*
+                 * Yes - this plugin includes one or more taps.
+                 */
+                register_tap_listener = gp;
+            }
+            else
+            {
+                /*
+                 * No - no taps here.
+                 */
+                register_tap_listener = NULL;
+            }
+
+            /*
+             * Do we have an old-style init routine?
+             */
+            if (g_module_symbol(handle, "plugin_init", &gp))
+            {
+                /*
+                 * Yes - do we also have a register routine or a
+                 * register_tap_listener routine?  If so, this is a bogus
+                 * hybrid of an old-style and new-style plugin.
+                 */
+                if (register_protoinfo != NULL || register_tap_listener != NULL)
+                {
+                    report_failure("The plugin '%s' has an old plugin init routine\nand a new register or register_tap_listener routine.",
+                                   name);
+                    g_module_close(handle);
+                    continue;
+                }
+
+                /*
+                 * It's just an unsupported old-style plugin;
+                 */
+                report_failure("The plugin '%s' has an old plugin init routine. Support has been dropped.\n Information on how to update your plugin is available at \nhttp://anonsvn.wireshark.org/wireshark/trunk/doc/README.plugins",
+                               name);
+                g_module_close(handle);
+                continue;
+            }
+
+            /*
+             * Do we have a register_wtap_module routine?
+             */
+            if (g_module_symbol(handle, "register_wtap_module", &gp))
+            {
+                register_wtap_module = gp;
+            }
+            else
+            {
+                register_wtap_module = NULL;
+            }
+
+            /*
+             * Do we have a register_codec_module routine?
+             */
+            if (g_module_symbol(handle, "register_codec_module", &gp))
+            {
+                register_codec_module = gp;
+            }
+            else
+            {
+                register_codec_module = NULL;
+            }
+
+            /*
+             * Does this dissector do anything useful?
+             */
+            if (register_protoinfo == NULL &&
+                register_tap_listener == NULL &&
+                register_wtap_module == NULL &&
+                register_codec_module == NULL )
+            {
+                /*
+                 * No.
+                 */
+                report_failure("The plugin '%s' has neither a register routine, "
+                               "a register_tap_listener or a register_wtap_module or a register_codec_module routine",
+                               name);
+                g_module_close(handle);
+                continue;
+            }
+
+            /*
+             * OK, attempt to add it to the list of plugins.
+             */
+            if ((cr = add_plugin(handle, g_strdup(name), version,
+                                 register_protoinfo, reg_handoff,
+                                 register_tap_listener,register_wtap_module,register_codec_module)))
+            {
+                if (cr == EEXIST)
+                    fprintf(stderr, "The plugin %s, version %s\n"
+                            "was found in multiple directories\n", name, version);
+                else
+                    fprintf(stderr, "Memory allocation problem\n"
+                            "when processing plugin %s, version %s\n",
+                            name, version);
+                g_module_close(handle);
+                continue;
+            }
+
+        }
+        ws_dir_close(dir);
+    }
 }
 
 /* get the personal plugin dir */
@@ -342,70 +349,76 @@ init_plugins(void)
     const char *name;
     char *plugin_dir_path;
     char *plugins_pers_dir;
-    WS_DIR *dir;		/* scanned directory */
-    WS_DIRENT *file;		/* current file */
+    WS_DIR *dir;                /* scanned directory */
+    WS_DIRENT *file;                /* current file */
 
     if (plugin_list == NULL)      /* ensure init_plugins is only run once */
     {
-	/*
-	 * Scan the global plugin directory.
-	 * If we're running from a build directory, scan the subdirectories
-	 * of that directory, as the global plugin directory is the
-	 * "plugins" directory of the source tree, and the subdirectories
-	 * are the source directories for the plugins, with the plugins
-	 * built in those subdirectories.
-	 */
-	plugin_dir = get_plugin_dir();
-	if (running_in_build_directory()) {
-	    if ((dir = ws_dir_open(plugin_dir, 0, NULL)) != NULL) {
-		while ((file = ws_dir_read_name(dir)) != NULL)	{
-		    name = ws_dir_get_name(file);
-		    if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0)
-			continue;	/* skip "." and ".." */
-		    /*
-		     * Get the full path of a ".libs" subdirectory of that
-		     * directory.
-		     */
-		    plugin_dir_path = g_strdup_printf(
-			"%s" G_DIR_SEPARATOR_S "%s" G_DIR_SEPARATOR_S ".libs",
-			plugin_dir, name);
-		    if (test_for_directory(plugin_dir_path) != EISDIR) {
-			/*
-			 * Either it doesn't refer to a directory or it
-			 * refers to something that doesn't exist.
-			 *
-			 * Assume that means that the plugins are in
-			 * the subdirectory of the plugin directory, not
-			 * a ".libs" subdirectory of that subdirectory.
-			 */
-			g_free(plugin_dir_path);
-			plugin_dir_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s",
-			    plugin_dir, name);
-		    }
-		    plugins_scan_dir(plugin_dir_path);
-		    g_free(plugin_dir_path);
-		}
-		ws_dir_close(dir);
-	    }
-	} else
-	    plugins_scan_dir(plugin_dir);
-
-	/*
-	 * If the program wasn't started with special privileges,
-	 * scan the users plugin directory.  (Even if we relinquish
-	 * them, plugins aren't safe unless we've *permanently*
-	 * relinquished them, and we can't do that in Wireshark as,
-	 * if we need privileges to start capturing, we'd need to
-	 * reclaim them before each time we start capturing.)
-	 */
-	if (!started_with_special_privs()) {
-	    plugins_pers_dir = get_plugins_pers_dir();
-	    plugins_scan_dir(plugins_pers_dir);
-	    g_free(plugins_pers_dir);
-	}
+        /*
+         * Scan the global plugin directory.
+         * If we're running from a build directory, scan the subdirectories
+         * of that directory, as the global plugin directory is the
+         * "plugins" directory of the source tree, and the subdirectories
+         * are the source directories for the plugins, with the plugins
+         * built in those subdirectories.
+         */
+        plugin_dir = get_plugin_dir();
+        if (running_in_build_directory())
+        {
+            if ((dir = ws_dir_open(plugin_dir, 0, NULL)) != NULL)
+            {
+                while ((file = ws_dir_read_name(dir)) != NULL)
+                {
+                    name = ws_dir_get_name(file);
+                    if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0)
+                        continue;        /* skip "." and ".." */
+                    /*
+                     * Get the full path of a ".libs" subdirectory of that
+                     * directory.
+                     */
+                    plugin_dir_path = g_strdup_printf(
+                        "%s" G_DIR_SEPARATOR_S "%s" G_DIR_SEPARATOR_S ".libs",
+                        plugin_dir, name);
+                    if (test_for_directory(plugin_dir_path) != EISDIR) {
+                        /*
+                         * Either it doesn't refer to a directory or it
+                         * refers to something that doesn't exist.
+                         *
+                         * Assume that means that the plugins are in
+                         * the subdirectory of the plugin directory, not
+                         * a ".libs" subdirectory of that subdirectory.
+                         */
+                        g_free(plugin_dir_path);
+                        plugin_dir_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s",
+                            plugin_dir, name);
+                    }
+                    plugins_scan_dir(plugin_dir_path);
+                    g_free(plugin_dir_path);
+                }
+                ws_dir_close(dir);
+            }
+        }
+        else
+            plugins_scan_dir(plugin_dir);
+
+        /*
+         * If the program wasn't started with special privileges,
+         * scan the users plugin directory.  (Even if we relinquish
+         * them, plugins aren't safe unless we've *permanently*
+         * relinquished them, and we can't do that in Wireshark as,
+         * if we need privileges to start capturing, we'd need to
+         * reclaim them before each time we start capturing.)
+         */
+        if (!started_with_special_privs())
+        {
+            plugins_pers_dir = get_plugins_pers_dir();
+            plugins_scan_dir(plugins_pers_dir);
+            g_free(plugins_pers_dir);
+        }
     }
-	register_all_wiretap_modules();
-	register_all_codecs();
+
+    register_all_wiretap_modules();
+    register_all_codecs();
 }
 
 void
@@ -424,8 +437,8 @@ register_all_plugin_registrations(void)
      */
     for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
     {
-		if (pt_plug->register_protoinfo)
-			(pt_plug->register_protoinfo)();
+        if (pt_plug->register_protoinfo)
+            (pt_plug->register_protoinfo)();
     }
 }
 
@@ -445,8 +458,8 @@ register_all_plugin_handoffs(void)
      */
     for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
     {
-	if (pt_plug->reg_handoff)
-	    (pt_plug->reg_handoff)();
+        if (pt_plug->reg_handoff)
+            (pt_plug->reg_handoff)();
     }
 }
 
@@ -461,8 +474,8 @@ register_all_plugin_tap_listeners(void)
      */
     for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
     {
-	if (pt_plug->register_tap_listener)
-	    (pt_plug->register_tap_listener)();
+        if (pt_plug->register_tap_listener)
+            (pt_plug->register_tap_listener)();
     }
 }
 
@@ -477,8 +490,8 @@ register_all_wiretap_modules(void)
      */
     for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
     {
-		if (pt_plug->register_wtap_module)
-			(pt_plug->register_wtap_module)();
+        if (pt_plug->register_wtap_module)
+            (pt_plug->register_wtap_module)();
     }
 }
 
@@ -493,8 +506,8 @@ register_all_codecs(void)
      */
     for (pt_plug = plugin_list; pt_plug != NULL; pt_plug = pt_plug->next)
     {
-		if (pt_plug->register_codec_module)
-			(pt_plug->register_codec_module)();
+        if (pt_plug->register_codec_module)
+              (pt_plug->register_codec_module)();
     }
 }
 #endif