Skip to content
This repository was archived by the owner on Feb 28, 2025. It is now read-only.

Commit 409c924

Browse files
committed
formatting: step 6 - manual tweaks
* Reformat tests with magic comma * Remove macro guards causing unstable formatting ``` find . -type file -name '*.[ch]' | xargs sed -i '' -E 's|# *endif.+//.+$|#endif|g' ``` Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
1 parent d628532 commit 409c924

File tree

241 files changed

+3397
-1887
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+3397
-1887
lines changed

lib/charsets.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@ str_convert_to_display (const char *str)
110110

111111
/* --------------------------------------------------------------------------------------------- */
112112

113-
#endif // MC__CHARSETS_H
113+
#endif

lib/event-types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,4 @@ typedef struct
8181

8282
/*** inline functions ****************************************************************************/
8383

84-
#endif // MC__EVENT_TYPES_H
84+
#endif

lib/event.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ gboolean mc_event_raise (const gchar *, const gchar *, gpointer);
4343

4444
/*** inline functions ****************************************************************************/
4545

46-
#endif // MC__EVENT_H
46+
#endif

lib/event/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ mc_event_callback_t *mc_event_is_callback_in_array (GPtrArray *callbacks,
2828
gpointer event_init_data);
2929

3030
/*** inline functions ****************************************************************************/
31-
#endif // MC_EVENT_INTERNAL_H
31+
#endif

lib/file-entry.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ typedef struct
4646
/*** inline functions ****************************************************************************/
4747
/* --------------------------------------------------------------------------------------------- */
4848

49-
#endif // MC__FILE_ENTRY_H
49+
#endif

lib/filehighlight.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ void mc_fhl_clear (mc_fhl_t *fhl);
3131

3232
/*** inline functions ****************************************************************************/
3333

34-
#endif // MC__FILEHIGHLIGHT_H
34+
#endif

lib/filehighlight/ini-file-read.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,14 @@ mc_fhl_parse_get_file_type_id (mc_fhl_t *fhl, const gchar *group_name)
6666
{
6767
mc_fhl_filter_t *mc_filter;
6868

69-
const gchar *types[] = { "FILE", "FILE_EXE", "DIR", "LINK_DIR",
70-
"LINK", "HARDLINK", "SYMLINK", "STALE_LINK",
71-
"DEVICE", "DEVICE_BLOCK", "DEVICE_CHAR", "SPECIAL",
72-
"SPECIAL_SOCKET", "SPECIAL_FIFO", "SPECIAL_DOOR", NULL };
69+
const gchar *types[] = {
70+
"FILE", "FILE_EXE", //
71+
"DIR", "LINK_DIR", //
72+
"LINK", "HARDLINK", "SYMLINK", "STALE_LINK", //
73+
"DEVICE", "DEVICE_BLOCK", "DEVICE_CHAR", //
74+
"SPECIAL", "SPECIAL_SOCKET", "SPECIAL_FIFO", "SPECIAL_DOOR", //
75+
NULL,
76+
};
7377
int i;
7478
gchar *param_type;
7579

lib/filehighlight/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,4 @@ gboolean mc_fhl_init_from_standard_files (mc_fhl_t *fhl);
5858

5959
/*** inline functions ****************************************************************************/
6060

61-
#endif // MC__FILEHIGHLIGHT_INTERNAL_H
61+
#endif

lib/glibcompat.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ g_ptr_array_find_with_equal_func (GPtrArray *haystack, gconstpointer needle, GEq
9797

9898
return FALSE;
9999
}
100-
#endif // ! GLIB_CHECK_VERSION (2, 54, 0)
100+
#endif
101101

102102
/* --------------------------------------------------------------------------------------------- */
103103

@@ -162,7 +162,7 @@ g_clear_list (GList **list_ptr, GDestroyNotify destroy)
162162
}
163163
}
164164

165-
#endif // ! GLIB_CHECK_VERSION (2, 63, 3)
165+
#endif
166166

167167
/* --------------------------------------------------------------------------------------------- */
168168

@@ -187,7 +187,7 @@ g_queue_clear_full (GQueue *queue, GDestroyNotify free_func)
187187

188188
g_queue_clear (queue);
189189
}
190-
#endif // ! GLIB_CHECK_VERSION (2, 60, 0)
190+
#endif
191191

192192
/* --------------------------------------------------------------------------------------------- */
193193

@@ -222,7 +222,7 @@ g_string_new_take (char *init)
222222

223223
return string;
224224
}
225-
#endif // ! GLIB_CHECK_VERSION (2, 77, 0)
225+
#endif
226226

227227
/* --------------------------------------------------------------------------------------------- */
228228

lib/glibcompat.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#ifndef G_OPTION_ENTRY_NULL
77
# define G_OPTION_ENTRY_NULL { NULL, '\0', 0, 0, NULL, NULL, NULL }
8-
#endif // G_OPTION_ENTRY_NULL
8+
#endif
99

1010
/*** enums ***************************************************************************************/
1111

@@ -18,20 +18,20 @@
1818
#if !GLIB_CHECK_VERSION(2, 54, 0)
1919
gboolean g_ptr_array_find_with_equal_func (GPtrArray *haystack, gconstpointer needle,
2020
GEqualFunc equal_func, guint *index_);
21-
#endif // ! GLIB_CHECK_VERSION (2, 54, 0)
21+
#endif
2222

2323
#if !GLIB_CHECK_VERSION(2, 63, 3)
2424
void g_clear_slist (GSList **slist_ptr, GDestroyNotify destroy);
2525
void g_clear_list (GList **list_ptr, GDestroyNotify destroy);
26-
#endif // ! GLIB_CHECK_VERSION (2, 63, 3)
26+
#endif
2727

2828
#if !GLIB_CHECK_VERSION(2, 60, 0)
2929
void g_queue_clear_full (GQueue *queue, GDestroyNotify free_func);
30-
#endif // ! GLIB_CHECK_VERSION (2, 60, 0)
30+
#endif
3131

3232
#if !GLIB_CHECK_VERSION(2, 77, 0)
3333
GString *g_string_new_take (char *init);
34-
#endif // ! GLIB_CHECK_VERSION (2, 77, 0)
34+
#endif
3535

3636
/* There is no such API in GLib2 */
3737
GString *mc_g_string_copy (GString *dest, const GString *src);
@@ -44,4 +44,4 @@ GString *mc_g_string_append_c_len (GString *s, gchar c, guint len);
4444

4545
/*** inline functions ****************************************************************************/
4646

47-
#endif // MC_GLIBCOMPAT_H
47+
#endif

0 commit comments

Comments
 (0)