Ticket #4592: migrate to clang-format - step 1: convert comments /* */ -> //

"Safe" automatic replacement and then manual tweaks:

```
find . -type file -name '*.[ch]' | xargs sed -i '' -E '/^\/\*/! s|/\*([^/]+)\*/$|//\1|g'
find . -type file -name '*.[ch]' | xargs sed -i '' -E s/ +$//
```

Signed-off-by: Yury V. Zaytsev <[email protected]>

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"
 
@@ -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));
             }
@@ -203,19 +203,19 @@ load_codepages_list (void)
 {
     char *fname;
 
-    /* 1: try load /usr/share/mc/mc.charsets */
+    // 1: try load /usr/share/mc/mc.charsets
     fname = g_build_filename (mc_global.share_data_dir, CHARSETS_LIST, (char *) NULL);
     load_codepages_list_from_file (&codepages, fname);
     g_free (fname);
 
-    /* 2: try load /etc/mc/mc.charsets */
+    // 2: try load /etc/mc/mc.charsets
     fname = g_build_filename (mc_global.sysconfig_dir, CHARSETS_LIST, (char *) NULL);
     load_codepages_list_from_file (&codepages, fname);
     g_free (fname);
 
     if (codepages == NULL)
     {
-        /* files are not found, add default codepage */
+        // 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);
@@ -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,7 +309,7 @@ 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)
@@ -320,7 +320,7 @@ init_translation_table (int cpsource, int cpdisplay)
 
     g_iconv_close (cd);
 
-    /* inpit <- display table */
+    // inpit <- display table
 
     cd = g_iconv_open (cp_source, cp_display);
     if (cd == INVALID_CONV)

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

@@ -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

@@ -45,4 +45,4 @@ gboolean mc_event_raise (const gchar *, const gchar *, gpointer);
 
 /*** inline functions ****************************************************************************/
 
-#endif /* MC__EVENT_H */
+#endif // MC__EVENT_H

lib/event/internal.h

@@ -29,4 +29,4 @@ mc_event_callback_t *mc_event_is_callback_in_array (GPtrArray * callbacks,
                                                     gpointer event_init_data);
 
 /*** inline functions ****************************************************************************/
-#endif /* MC_EVENT_INTERNAL_H */
+#endif // MC_EVENT_INTERNAL_H

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

lib/filehighlight.h

@@ -1,7 +1,7 @@
 #ifndef MC__FILEHIGHLIGHT_H
 #define MC__FILEHIGHLIGHT_H
 
-#include "lib/mcconfig.h"       /* mc_config_t */
+#include "lib/mcconfig.h"       // mc_config_t
 #include "lib/file-entry.h"
 
 /*** typedefs(not structures) and defined constants **********************************************/
@@ -31,4 +31,4 @@ void mc_fhl_clear (mc_fhl_t * fhl);
 
 /*** inline functions ****************************************************************************/
 
-#endif /* MC__FILEHIGHLIGHT_H */
+#endif // MC__FILEHIGHLIGHT_H

lib/filehighlight/common.c

@@ -27,7 +27,7 @@
 #include <config.h>
 
 #include "lib/global.h"
-#include "lib/util.h"           /* MC_PTR_FREE */
+#include "lib/util.h"           // MC_PTR_FREE
 
 #include "lib/filehighlight.h"
 

lib/filehighlight/get-color.c

@@ -29,7 +29,7 @@
 
 #include "lib/global.h"
 #include "lib/skin.h"
-#include "lib/util.h"           /* is_exe() */
+#include "lib/util.h"           // is_exe()
 #include "lib/filehighlight.h"
 #include "internal.h"
 

lib/filehighlight/ini-file-read.c

@@ -31,7 +31,7 @@
 #include "lib/fileloc.h"
 #include "lib/strutil.h"
 #include "lib/skin.h"
-#include "lib/util.h"           /* exist_file() */
+#include "lib/util.h"           // exist_file()
 
 #include "lib/filehighlight.h"
 
@@ -206,21 +206,21 @@ mc_fhl_init_from_standard_files (mc_fhl_t *fhl)
     gchar *name;
     gboolean ok;
 
-    /* ${XDG_CONFIG_HOME}/mc/filehighlight.ini */
+    // ${XDG_CONFIG_HOME}/mc/filehighlight.ini
     name = mc_config_get_full_path (MC_FHL_INI_FILE);
     ok = mc_fhl_read_ini_file (fhl, name);
     g_free (name);
     if (ok)
         return TRUE;
 
-    /* ${sysconfdir}/mc/filehighlight.ini  */
+    // ${sysconfdir}/mc/filehighlight.ini
     name = g_build_filename (mc_global.sysconfig_dir, MC_FHL_INI_FILE, (char *) NULL);
     ok = mc_fhl_read_ini_file (fhl, name);
     g_free (name);
     if (ok)
         return TRUE;
 
-    /* ${datadir}/mc/filehighlight.ini  */
+    // ${datadir}/mc/filehighlight.ini
     name = g_build_filename (mc_global.share_data_dir, MC_FHL_INI_FILE, (char *) NULL);
     ok = mc_fhl_read_ini_file (fhl, name);
     g_free (name);
@@ -245,17 +245,17 @@ mc_fhl_parse_ini_file (mc_fhl_t *fhl)
     {
         if (mc_config_has_param (fhl->config, *group_names, "type"))
         {
-            /* parse filetype filter */
+            // parse filetype filter
             mc_fhl_parse_get_file_type_id (fhl, *group_names);
         }
         if (mc_config_has_param (fhl->config, *group_names, "regexp"))
         {
-            /* parse regexp filter */
+            // parse regexp filter
             mc_fhl_parse_get_regexp (fhl, *group_names);
         }
         if (mc_config_has_param (fhl->config, *group_names, "extensions"))
         {
-            /* parse extensions filter */
+            // parse extensions filter
             mc_fhl_parse_get_extensions (fhl, *group_names);
         }
     }