Use macros in array declarations.

Signed-off-by: Andrew Borodin <[email protected]>
MidnightCommander · Feb 3, 2025 · 1f5e3c1 · 1f5e3c1
1 parent ea726b1
commit 1f5e3c1
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 9 deletions.
diff --git a/lib/global.h b/lib/global.h
@@ -64,6 +64,7 @@
 #define BUF_10K       10240L
 #define BUF_8K        8192L
 #define BUF_4K        4096L
+#define BUF_2K        2048L
 #define BUF_1K        1024L
 
 #define BUF_LARGE     BUF_1K

diff --git a/lib/widget/wtools.c b/lib/widget/wtools.c
@@ -152,7 +152,7 @@ fg_input_dialog_help (const char *header, const char *text, const char *help,
                       input_complete_t completion_flags)
 {
     char *p_text;
-    char histname[64] = "inp|";
+    char histname[BUF_TINY] = "inp|";
     gboolean is_passwd = FALSE;
     char *my_str = NULL;
 

diff --git a/src/editor/syntax.c b/src/editor/syntax.c
@@ -955,9 +955,11 @@ edit_read_syntax_rules (WEdit *edit, FILE *f, char **args, int args_size)
 {
     FILE *g = NULL;
     tty_color_pair_t color;
-    char last_fg[32] = "", last_bg[32] = "", last_attrs[64] = "";
-    char whole_right[512];
-    char whole_left[512];
+    char last_fg[BUF_TINY/2] = "";
+    char last_bg[BUF_TINY/2] = "";
+    char last_attrs[BUF_TINY] = "";
+    char whole_right[BUF_MEDIUM];
+    char whole_left[BUF_MEDIUM];
     char *l = NULL;
     int save_line = 0, line = 0;
     context_rule_t *c = NULL;

diff --git a/src/filemanager/ext.c b/src/filemanager/ext.c
@@ -655,7 +655,7 @@ regex_check_type (const vfs_path_t *filename_vpath, const char *ptr, gboolean ca
     gboolean found = FALSE;
 
     // Following variables are valid if *have_type is TRUE
-    static char content_string[2048];
+    static char content_string[BUF_2K];
     static size_t content_shift = 0;
     static int got_data = 0;
 

diff --git a/src/subshell/common.c b/src/subshell/common.c
@@ -173,7 +173,7 @@ enum
 /*** file scope variables ************************************************************************/
 
 /* tcsh closes all non-standard file descriptors, so we have to use a pipe */
-static char tcsh_fifo[128];
+static char tcsh_fifo[BUF_SMALL];
 
 static int subshell_pty_slave = -1;
 

diff --git a/src/vfs/ftpfs/ftpfs.c b/src/vfs/ftpfs/ftpfs.c
@@ -1666,7 +1666,8 @@ static void
 resolve_symlink_with_ls_options (struct vfs_class *me, struct vfs_s_super *super,
                                  struct vfs_s_inode *dir)
 {
-    char buffer[2048] = "", *filename;
+    char buffer[BUF_2K] = "";
+    char *filename;
     int sock;
     FILE *fp;
     struct stat s;

diff --git a/src/vfs/sfs/sfs.c b/src/vfs/sfs/sfs.c
@@ -135,7 +135,7 @@ static int
 sfs_vfmake (const vfs_path_t *vpath, vfs_path_t *cache_vpath)
 {
     int w;
-    char pad[10240];
+    char pad[BUF_10K];
     char *s_iter, *t = pad;
     gboolean was_percent = FALSE;
     vfs_path_t *pname;  // name of parent archive

diff --git a/src/vfs/shell/shell.c b/src/vfs/shell/shell.c
@@ -562,7 +562,7 @@ static gboolean
 shell_open_archive_talk (struct vfs_class *me, struct vfs_s_super *super)
 {
     shell_super_t *shell_super = SHELL_SUPER (super);
-    char answer[2048];
+    char answer[BUF_2K];
 
     printf ("\n%s\n", _ ("shell: Waiting for initial line..."));