formatting: step 4 - reformat all files

Signed-off-by: Yury V. Zaytsev <yury@shurup.com>

Author: zyv

lib/charsets.c

@@ -34,9 +34,9 @@
 #include <string.h>
 
 #include "lib/global.h"
-#include "lib/strutil.h"        // utf-8 functions 
+#include "lib/strutil.h"  // utf-8 functions
 #include "lib/fileloc.h"
-#include "lib/util.h"           // whitespace() 
+#include "lib/util.h"  // whitespace()
 
 #include "lib/charsets.h"
 
@@ -52,7 +52,7 @@ const char *cp_source = NULL;
 
 /*** file scope macro definitions ****************************************************************/
 
-#define UNKNCHAR '\001'
+#define UNKNCHAR   '\001'
 
 #define OTHER_8BIT "Other_8_bit"
 
@@ -106,7 +106,7 @@ load_codepages_list_from_file (GPtrArray **list, const char *fname)
 
     while (fgets (buf, sizeof buf, f) != NULL)
     {
-        // split string into id and cpname 
+        // split string into id and cpname
         char *p = buf;
         size_t buflen;
 
@@ -142,8 +142,8 @@ load_codepages_list_from_file (GPtrArray **list, const char *fname)
             {
                 unsigned int i;
 
-                // whether id is already present in list 
-                // if yes, overwrite description 
+                // whether id is already present in list
+                // if yes, overwrite description
                 for (i = 0; i < (*list)->len; i++)
                 {
                     codepage_desc *desc;
@@ -152,14 +152,14 @@ load_codepages_list_from_file (GPtrArray **list, const char *fname)
 
                     if (strcmp (id, desc->id) == 0)
                     {
-                        // found 
+                        // found
                         g_free (desc->name);
                         desc->name = g_strdup (p);
                         break;
                     }
                 }
 
-                // not found 
+                // not found
                 if (i == (*list)->len)
                     g_ptr_array_add (*list, new_codepage_desc (id, p));
             }
@@ -172,7 +172,7 @@ load_codepages_list_from_file (GPtrArray **list, const char *fname)
         g_free (default_codepage);
     }
 
-  fail:
+fail:
     fclose (f);
 }
 
@@ -215,11 +215,11 @@ load_codepages_list (void)
 
     if (codepages == NULL)
     {
-        // files are not found, add default codepage 
-        fprintf (stderr, "%s\n", _("Warning: cannot load codepages list"));
+        // files are not found, add default codepage
+        fprintf (stderr, "%s\n", _ ("Warning: cannot load codepages list"));
 
         codepages = g_ptr_array_new_with_free_func (free_codepage_desc);
-        g_ptr_array_add (codepages, new_codepage_desc (DEFAULT_CHARSET, _("7-bit ASCII")));
+        g_ptr_array_add (codepages, new_codepage_desc (DEFAULT_CHARSET, _ ("7-bit ASCII")));
     }
 }
 
@@ -229,7 +229,7 @@ void
 free_codepages_list (void)
 {
     g_ptr_array_free (codepages, TRUE);
-    // NULL-ize pointer to make unit tests happy 
+    // NULL-ize pointer to make unit tests happy
     codepages = NULL;
 }
 
@@ -288,7 +288,7 @@ init_translation_table (int cpsource, int cpdisplay)
     int i;
     GIConv cd;
 
-    // Fill input <-> display tables 
+    // Fill input <-> display tables
 
     if (cpsource < 0 || cpdisplay < 0 || cpsource == cpdisplay)
     {
@@ -309,22 +309,22 @@ init_translation_table (int cpsource, int cpdisplay)
     cp_source = ((codepage_desc *) g_ptr_array_index (codepages, cpsource))->id;
     cp_display = ((codepage_desc *) g_ptr_array_index (codepages, cpdisplay))->id;
 
-    // display <- inpit table 
+    // display <- inpit table
 
     cd = g_iconv_open (cp_display, cp_source);
     if (cd == INVALID_CONV)
-        return g_strdup_printf (_("Cannot translate from %s to %s"), cp_source, cp_display);
+        return g_strdup_printf (_ ("Cannot translate from %s to %s"), cp_source, cp_display);
 
     for (i = 128; i <= 255; ++i)
         conv_displ[i] = translate_character (cd, i);
 
     g_iconv_close (cd);
 
-    // inpit <- display table 
+    // inpit <- display table
 
     cd = g_iconv_open (cp_source, cp_display);
     if (cd == INVALID_CONV)
-        return g_strdup_printf (_("Cannot translate from %s to %s"), cp_display, cp_source);
+        return g_strdup_printf (_ ("Cannot translate from %s to %s"), cp_display, cp_source);
 
     for (i = 128; i <= 255; ++i)
     {
@@ -489,13 +489,13 @@ convert_from_8bit_to_utf_c (char input_char, GIConv conv)
     switch (str_translate_char (conv, (char *) str, -1, (char *) buf_ch, sizeof (buf_ch)))
     {
     case ESTR_SUCCESS:
-        {
-            int res;
+    {
+        int res;
 
-            res = g_utf8_get_char_validated ((char *) buf_ch, -1);
-            ch = res >= 0 ? res : buf_ch[0];
-            break;
-        }
+        res = g_utf8_get_char_validated ((char *) buf_ch, -1);
+        ch = res >= 0 ? res : buf_ch[0];
+        break;
+    }
     case ESTR_PROBLEM:
     case ESTR_FAILURE:
     default:

lib/charsets.h

@@ -110,4 +110,4 @@ str_convert_to_display (const char *str)
 
 /* --------------------------------------------------------------------------------------------- */
 
-#endif // MC__CHARSETS_H 
+#endif  // MC__CHARSETS_H

lib/event-types.h

@@ -6,12 +6,12 @@
 /*** typedefs(not structures) and defined constants **********************************************/
 
 /* Event groups for main modules */
-#define MCEVENT_GROUP_CORE "Core"
-#define MCEVENT_GROUP_DIALOG "Dialog"
-#define MCEVENT_GROUP_DIFFVIEWER "DiffViewer"
-#define MCEVENT_GROUP_EDITOR "Editor"
+#define MCEVENT_GROUP_CORE        "Core"
+#define MCEVENT_GROUP_DIALOG      "Dialog"
+#define MCEVENT_GROUP_DIFFVIEWER  "DiffViewer"
+#define MCEVENT_GROUP_EDITOR      "Editor"
 #define MCEVENT_GROUP_FILEMANAGER "FileManager"
-#define MCEVENT_GROUP_VIEWER "Viewer"
+#define MCEVENT_GROUP_VIEWER      "Viewer"
 
 /* Events */
 #define MCEVENT_HISTORY_LOAD "history_load"
@@ -72,7 +72,7 @@ struct Widget;
 typedef struct
 {
     struct mc_config_t *cfg;
-    struct Widget *receiver;    // NULL means broadcast message 
+    struct Widget *receiver;  // NULL means broadcast message
 } ev_history_load_save_t;
 
 /*** global variables defined in .c file *********************************************************/
@@ -81,4 +81,4 @@ typedef struct
 
 /*** inline functions ****************************************************************************/
 
-#endif // MC__EVENT_TYPES_H 
+#endif  // MC__EVENT_TYPES_H

lib/event.h

@@ -24,25 +24,23 @@ typedef struct
 /*** declarations of public functions ************************************************************/
 
 /* event.c: */
-gboolean mc_event_init (GError ** mcerror);
-gboolean mc_event_deinit (GError ** mcerror);
-
+gboolean mc_event_init (GError **mcerror);
+gboolean mc_event_deinit (GError **mcerror);
 
 /* manage.c: */
-gboolean mc_event_add (const gchar * event_group_name, const gchar * event_name,
+gboolean mc_event_add (const gchar *event_group_name, const gchar *event_name,
                        mc_event_callback_func_t event_callback, gpointer event_init_data,
-                       GError ** mcerror);
-void mc_event_del (const gchar * event_group_name, const gchar * event_name,
+                       GError **mcerror);
+void mc_event_del (const gchar *event_group_name, const gchar *event_name,
                    mc_event_callback_func_t event_callback, gpointer event_init_data);
-void mc_event_destroy (const gchar * event_group_name, const gchar * event_name);
-void mc_event_group_del (const gchar * event_group_name);
-gboolean mc_event_present (const gchar * event_group_name, const gchar * event_name);
-gboolean mc_event_mass_add (const event_init_t * events, GError ** mcerror);
+void mc_event_destroy (const gchar *event_group_name, const gchar *event_name);
+void mc_event_group_del (const gchar *event_group_name);
+gboolean mc_event_present (const gchar *event_group_name, const gchar *event_name);
+gboolean mc_event_mass_add (const event_init_t *events, GError **mcerror);
 
 /* raise.c: */
 gboolean mc_event_raise (const gchar *, const gchar *, gpointer);
 
-
 /*** inline functions ****************************************************************************/
 
-#endif // MC__EVENT_H 
+#endif  // MC__EVENT_H

lib/event/event.c

@@ -54,17 +54,16 @@ mc_event_init (GError **mcerror)
 
     if (mc_event_grouplist != NULL)
     {
-        mc_propagate_error (mcerror, 0, "%s", _("Event system already initialized"));
+        mc_propagate_error (mcerror, 0, "%s", _ ("Event system already initialized"));
         return FALSE;
     }
 
-    mc_event_grouplist =
-        g_tree_new_full ((GCompareDataFunc) g_ascii_strcasecmp,
-                         NULL, (GDestroyNotify) g_free, (GDestroyNotify) g_tree_destroy);
+    mc_event_grouplist = g_tree_new_full ((GCompareDataFunc) g_ascii_strcasecmp, NULL,
+                                          (GDestroyNotify) g_free, (GDestroyNotify) g_tree_destroy);
 
     if (mc_event_grouplist == NULL)
     {
-        mc_propagate_error (mcerror, 0, "%s", _("Failed to initialize event system"));
+        mc_propagate_error (mcerror, 0, "%s", _ ("Failed to initialize event system"));
         return FALSE;
     }
 
@@ -80,7 +79,7 @@ mc_event_deinit (GError **mcerror)
 
     if (mc_event_grouplist == NULL)
     {
-        mc_propagate_error (mcerror, 0, "%s", _("Event system not initialized"));
+        mc_propagate_error (mcerror, 0, "%s", _ ("Event system not initialized"));
         return FALSE;
     }
 
@@ -100,8 +99,7 @@ mc_event_mass_add (const event_init_t *events, GError **mcerror)
 
     for (array_index = 0; events[array_index].event_group_name != NULL; array_index++)
     {
-        if (!mc_event_add (events[array_index].event_group_name,
-                           events[array_index].event_name,
+        if (!mc_event_add (events[array_index].event_group_name, events[array_index].event_name,
                            events[array_index].cb, events[array_index].init_data, mcerror))
         {
             return FALSE;

lib/event/internal.h

@@ -13,20 +13,19 @@ typedef struct mc_event_callback_struct
     mc_event_callback_func_t callback;
 } mc_event_callback_t;
 
-
 /*** global variables defined in .c file *******************************/
 
 extern GTree *mc_event_grouplist;
 
 /*** declarations of public functions **********************************/
 
-GTree *mc_event_get_event_group_by_name (const gchar * event_group_name, gboolean create_new,
-                                         GError ** mcerror);
-GPtrArray *mc_event_get_event_by_name (GTree * event_group, const gchar * event_name,
-                                       gboolean create_new, GError ** mcerror);
-mc_event_callback_t *mc_event_is_callback_in_array (GPtrArray * callbacks,
+GTree *mc_event_get_event_group_by_name (const gchar *event_group_name, gboolean create_new,
+                                         GError **mcerror);
+GPtrArray *mc_event_get_event_by_name (GTree *event_group, const gchar *event_name,
+                                       gboolean create_new, GError **mcerror);
+mc_event_callback_t *mc_event_is_callback_in_array (GPtrArray *callbacks,
                                                     mc_event_callback_func_t event_callback,
                                                     gpointer event_init_data);
 
 /*** inline functions ****************************************************************************/
-#endif // MC_EVENT_INTERNAL_H 
+#endif  // MC_EVENT_INTERNAL_H

lib/event/manage.c

@@ -69,7 +69,7 @@ mc_event_add (const gchar *event_group_name, const gchar *event_name,
     if (mc_event_grouplist == NULL || event_group_name == NULL || event_name == NULL
         || event_callback == NULL)
     {
-        mc_propagate_error (mcerror, 0, "%s", _("Check input data! Some of parameters are NULL!"));
+        mc_propagate_error (mcerror, 0, "%s", _ ("Check input data! Some of parameters are NULL!"));
         return FALSE;
     }
 
@@ -157,13 +157,11 @@ mc_event_get_event_group_by_name (const gchar *event_group_name, gboolean create
     if (event_group == NULL && create_new)
     {
         event_group =
-            g_tree_new_full ((GCompareDataFunc) g_ascii_strcasecmp,
-                             NULL,
-                             (GDestroyNotify) g_free,
+            g_tree_new_full ((GCompareDataFunc) g_ascii_strcasecmp, NULL, (GDestroyNotify) g_free,
                              (GDestroyNotify) mc_event_group_destroy_value);
         if (event_group == NULL)
         {
-            mc_propagate_error (mcerror, 0, _("Unable to create group '%s' for events!"),
+            mc_propagate_error (mcerror, 0, _ ("Unable to create group '%s' for events!"),
                                 event_group_name);
             return NULL;
         }
@@ -188,7 +186,7 @@ mc_event_get_event_by_name (GTree *event_group, const gchar *event_name, gboolea
         callbacks = g_ptr_array_new_with_free_func (g_free);
         if (callbacks == NULL)
         {
-            mc_propagate_error (mcerror, 0, _("Unable to create event '%s'!"), event_name);
+            mc_propagate_error (mcerror, 0, _ ("Unable to create event '%s'!"), event_name);
             return NULL;
         }
         g_tree_insert (event_group, g_strdup (event_name), (gpointer) callbacks);

lib/file-entry.h

@@ -8,7 +8,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "lib/global.h"         // include <glib.h> 
+#include "lib/global.h"  // include <glib.h>
 
 /*** typedefs(not structures) and defined constants **********************************************/
 
@@ -19,22 +19,22 @@
 /* keys are set only during sorting */
 typedef struct
 {
-    // File name 
+    // File name
     GString *fname;
-    // File attributes 
+    // File attributes
     struct stat st;
-    // Key used for comparing names 
+    // Key used for comparing names
     char *name_sort_key;
-    // Key used for comparing extensions 
+    // Key used for comparing extensions
     char *extension_sort_key;
 
-    // Flags 
+    // Flags
     struct
     {
-        unsigned int marked:1;  // File marked in pane window 
-        unsigned int link_to_dir:1;     // If this is a link, does it point to directory? 
-        unsigned int stale_link:1;      // If this is a symlink and points to Charon's land 
-        unsigned int dir_size_computed:1;       // Size of directory was computed with dirsizes_cmd 
+        unsigned int marked : 1;             // File marked in pane window
+        unsigned int link_to_dir : 1;        // If this is a link, does it point to directory?
+        unsigned int stale_link : 1;         // If this is a symlink and points to Charon's land
+        unsigned int dir_size_computed : 1;  // Size of directory was computed with dirsizes_cmd
     } f;
 } file_entry_t;
 
@@ -46,4 +46,4 @@ typedef struct
 /*** inline functions ****************************************************************************/
 /* --------------------------------------------------------------------------------------------- */
 
-#endif // MC__FILE_ENTRY_H 
+#endif  // MC__FILE_ENTRY_H