Skip to content

Commit 6175f87

Browse files
zyvzyv
committed
Ticket #4573: remove obsolete cppcheck infrastructure
Signed-off-by: Yury V. Zaytsev <yury@shurup.com>
1 parent f9ef906 commit 6175f87

File tree

16 files changed

+4
-146
lines changed

16 files changed

+4
-146
lines changed

‎Makefile.am

Lines changed: 1 addition & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,7 @@ ACLOCAL_AMFLAGS = -I m4
1919

2020
CONFIG_STATUS_DEPENDENCIES = $(top_srcdir)/mc-version.h
2121

22-
.PHONY: update-version \
23-
cppcheck \
24-
cppcheck-error \
25-
cppcheck-information \
26-
cppcheck-performance \
27-
cppcheck-portability \
28-
cppcheck-style \
29-
cppcheck-warning \
30-
cppcheck-all
31-
22+
.PHONY: update-version
3223

3324
update-version:
3425
@if test -x $(top_srcdir)/version.sh; then \
@@ -42,79 +33,6 @@ update-version:
4233

4334
$(top_srcdir)/mc-version.h: update-version
4435

45-
CPPCHECK_CMD = cppcheck \
46-
--inline-suppr \
47-
--error-exitcode=0 \
48-
-j 4 \
49-
--force \
50-
-I $(top_srcdir)/lib \
51-
--language=c \
52-
--std=c99
53-
54-
CPPCHECK_DIRS = \
55-
"$(top_srcdir)/lib" \
56-
"$(top_srcdir)/src"
57-
58-
CPPCHECK_OUT_PREFIX = $(top_builddir)/cppcheck-
59-
60-
CPPCHECK_OUT_EXT = log.txt
61-
62-
CPPCHECK_SED_FILTER = \
63-
-e '/is reassigned a value before the old one has been used./d' \
64-
-e '/ Unmatched suppression: /d' \
65-
-e "/Skipping configuration '.*' since the value of '.*' is unknown./d"
66-
67-
cppcheck:
68-
$(CPPCHECK_CMD) --enable=all $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT).tmp;
69-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT)
70-
rm -f $(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT).tmp
71-
72-
cppcheck-all: cppcheck
73-
74-
cppcheck-information:
75-
$(CPPCHECK_CMD) --enable=information $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)information.$(CPPCHECK_OUT_EXT).tmp;
76-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)information.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)information.$(CPPCHECK_OUT_EXT)
77-
rm -f $(CPPCHECK_OUT_PREFIX)all.$(CPPCHECK_OUT_EXT).tmp
78-
79-
cppcheck-performance:
80-
$(CPPCHECK_CMD) --enable=performance $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT).tmp;
81-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT)
82-
rm -f $(CPPCHECK_OUT_PREFIX)performance.$(CPPCHECK_OUT_EXT).tmp
83-
84-
cppcheck-portability:
85-
$(CPPCHECK_CMD) --enable=portability $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT).tmp;
86-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT)
87-
rm -f $(CPPCHECK_OUT_PREFIX)portability.$(CPPCHECK_OUT_EXT).tmp
88-
89-
cppcheck-style:
90-
$(CPPCHECK_CMD) --enable=style $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT).tmp;
91-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT)
92-
rm -f $(CPPCHECK_OUT_PREFIX)style.$(CPPCHECK_OUT_EXT).tmp
93-
94-
cppcheck-warning:
95-
$(CPPCHECK_CMD) --enable=warning $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT).tmp;
96-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT)
97-
rm -f $(CPPCHECK_OUT_PREFIX)warning.$(CPPCHECK_OUT_EXT).tmp
98-
99-
cppcheck-unusedFunction:
100-
$(CPPCHECK_CMD) --enable=unusedFunction $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT).tmp;
101-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT)
102-
rm -f $(CPPCHECK_OUT_PREFIX)unusedFunction.$(CPPCHECK_OUT_EXT).tmp
103-
104-
cppcheck-missingInclude:
105-
$(CPPCHECK_CMD) --enable=missingInclude $(CPPCHECK_DIRS) 2>$(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT).tmp;
106-
$(SED) $(CPPCHECK_SED_FILTER) $(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT).tmp > $(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT)
107-
rm -f $(CPPCHECK_OUT_PREFIX)missingInclude.$(CPPCHECK_OUT_EXT).tmp
108-
109-
cppcheck-split-all: \
110-
cppcheck-information \
111-
cppcheck-performance \
112-
cppcheck-portability \
113-
cppcheck-style \
114-
cppcheck-warning \
115-
cppcheck-unusedFunction \
116-
cppcheck-missingInclude
117-
11836
INDENT_CMD = clang-format -i
11937

12038
INDENT_DIRS = \

‎lib/search/hex.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ mc_search__hex_translate_to_regex (const GString *astr, mc_search_hex_parse_erro
8181
while (g_ascii_isspace (str[loop]))
8282
loop++;
8383
}
84-
// cppcheck-suppress invalidscanf
8584
else if (sscanf (str + loop, "%x%n", &val, &ptr) == 1)
8685
{
8786
if (val > 255)

‎lib/strutil/strutilutf8.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ str_utf8_make_make_term_form (const char *text, const ssize_t width)
454454
result.width = 0;
455455
result.compose = FALSE;
456456

457-
if (width1 == 0 || text[0] == '\0')
457+
if (width1 == 0 || text == NULL || text[0] == '\0')
458458
return &result;
459459

460460
actual = result.text;

‎lib/tty/color-internal.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,10 @@ parse_256_or_true_color_name (const char *color_name)
118118
int i;
119119
char dummy;
120120

121-
// cppcheck-suppress invalidscanf
122121
if (sscanf (color_name, "color%d%c", &i, &dummy) == 1 && i >= 0 && i < 256)
123122
{
124123
return i;
125124
}
126-
// cppcheck-suppress invalidscanf
127125
if (sscanf (color_name, "gray%d%c", &i, &dummy) == 1 && i >= 0 && i < 24)
128126
{
129127
return 232 + i;

‎lib/tty/x11conn.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,10 @@ mc_XOpenDisplay (const char *displayname)
184184
{
185185
Display *retval;
186186

187-
// cppcheck-suppress redundantAssignment
188187
longjmp_allowed = TRUE;
189188

190189
retval = func_XOpenDisplay (displayname);
191190

192-
// cppcheck-suppress redundantAssignment
193191
longjmp_allowed = FALSE;
194192
return retval;
195193
}
@@ -208,12 +206,10 @@ mc_XCloseDisplay (Display *display)
208206
{
209207
int retval;
210208

211-
// cppcheck-suppress redundantAssignment
212209
longjmp_allowed = TRUE;
213210

214211
retval = func_XCloseDisplay (display);
215212

216-
// cppcheck-suppress redundantAssignment
217213
longjmp_allowed = FALSE;
218214

219215
return retval;
@@ -235,13 +231,11 @@ mc_XQueryPointer (Display *display, Window win, Window *root_return, Window *chi
235231
{
236232
if (setjmp (x11_exception) == 0)
237233
{
238-
// cppcheck-suppress redundantAssignment
239234
longjmp_allowed = TRUE;
240235

241236
retval = func_XQueryPointer (display, win, root_return, child_return, root_x_return,
242237
root_y_return, win_x_return, win_y_return, mask_return);
243238

244-
// cppcheck-suppress redundantAssignment
245239
longjmp_allowed = FALSE;
246240

247241
return retval;

‎lib/util.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,8 @@ mc_util_write_backup_content (const char *from_file_name, const char *to_file_na
197197
if (fwrite ((const void *) contents, 1, length, backup_fd) != length)
198198
ret1 = FALSE;
199199

200-
{
201-
int ret2;
202-
203-
// cppcheck-suppress redundantAssignment
204-
ret2 = fflush (backup_fd);
205-
// cppcheck-suppress redundantAssignment
206-
ret2 = fclose (backup_fd);
207-
(void) ret2;
208-
}
200+
fflush (backup_fd);
201+
fclose (backup_fd);
209202

210203
g_free (contents);
211204
return ret1;

‎lib/vfs/parse_ls_vga.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ is_year (char *str, struct tm *tim)
189189
if (strlen (str) != 4)
190190
return FALSE;
191191

192-
// cppcheck-suppress invalidscanf
193192
if (sscanf (str, "%ld", &year) != 1)
194193
return FALSE;
195194

@@ -586,7 +585,6 @@ vfs_parse_filedate (int idx, time_t *t)
586585
// Case with MM-DD-YY or MM-DD-YYYY
587586
p[2] = p[5] = '-';
588587

589-
// cppcheck-suppress invalidscanf
590588
if (sscanf (p, "%2d-%2d-%d", &d[0], &d[1], &d[2]) != 3)
591589
return 0; // sscanf failed
592590

@@ -764,17 +762,14 @@ vfs_parse_ls_lga (const char *p, struct stat *s, char **filename, char **linknam
764762
// Corner case: there is no whitespace(s) between maj & min
765763
if (!is_num (idx2) && idx2 == 2)
766764
{
767-
// cppcheck-suppress invalidscanf
768765
if (!is_num (++idx2) || sscanf (columns[idx2], " %d,%d", &maj, &min) != 2)
769766
goto error;
770767
}
771768
else
772769
{
773-
// cppcheck-suppress invalidscanf
774770
if (!is_num (idx2) || sscanf (columns[idx2], " %d,", &maj) != 1)
775771
goto error;
776772

777-
// cppcheck-suppress invalidscanf
778773
if (!is_num (++idx2) || sscanf (columns[idx2], " %d", &min) != 1)
779774
goto error;
780775
}

‎lib/vfs/path.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ vfs_path_url_split (vfs_path_element_t *path_element, const char *path)
259259
if (colon != NULL)
260260
{
261261
*colon = '\0';
262-
// cppcheck-suppress invalidscanf
263262
if (sscanf (colon + 1, "%d", &path_element->port) == 1)
264263
{
265264
if (path_element->port <= 0 || path_element->port >= 65536)

‎lib/vfs/utilvfs.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ vfs_url_split (const char *path, int default_port, vfs_url_flags_t flags)
326326
if (colon != NULL)
327327
{
328328
*colon = '\0';
329-
// cppcheck-suppress invalidscanf
330329
if (sscanf (colon + 1, "%d", &path_element->port) == 1)
331330
{
332331
if (path_element->port <= 0 || path_element->port >= 65536)

‎lib/widget/input_complete.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,6 @@ try_complete_all_possible (try_complete_automation_state_t *state, char *text, i
908908
char *s;
909909

910910
s = strchr (cdpath, ':');
911-
// cppcheck-suppress nullPointer
912911
if (s == NULL)
913912
s = strchr (cdpath, '\0');
914913
c = *s;

‎src/filemanager/boxes.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,6 @@ configure_vfs_box (void)
10991099

11001100
if (quick_dialog (&qdlg) != B_CANCEL)
11011101
{
1102-
// cppcheck-suppress uninitvar
11031102
if (ret_timeout[0] == '\0')
11041103
vfs_timeout = 0;
11051104
else
@@ -1110,12 +1109,9 @@ configure_vfs_box (void)
11101109
vfs_timeout = 10;
11111110
#ifdef ENABLE_VFS_FTP
11121111
g_free (ftpfs_anonymous_passwd);
1113-
// cppcheck-suppress uninitvar
11141112
ftpfs_anonymous_passwd = ret_passwd;
11151113
g_free (ftpfs_proxy_host);
1116-
// cppcheck-suppress uninitvar
11171114
ftpfs_proxy_host = ret_ftp_proxy;
1118-
// cppcheck-suppress uninitvar
11191115
if (ret_directory_timeout[0] == '\0')
11201116
ftpfs_directory_timeout = 0;
11211117
else

‎src/filemanager/mountlist.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -383,107 +383,86 @@ fstype_to_string (short int t)
383383
switch (t)
384384
{
385385
#ifdef MOUNT_PC
386-
// cppcheck-suppress syntaxError
387386
case MOUNT_PC:
388387
return "pc";
389388
#endif
390389
#ifdef MOUNT_MFS
391-
// cppcheck-suppress syntaxError
392390
case MOUNT_MFS:
393391
return "mfs";
394392
#endif
395393
#ifdef MOUNT_LO
396-
// cppcheck-suppress syntaxError
397394
case MOUNT_LO:
398395
return "lo";
399396
#endif
400397
#ifdef MOUNT_TFS
401-
// cppcheck-suppress syntaxError
402398
case MOUNT_TFS:
403399
return "tfs";
404400
#endif
405401
#ifdef MOUNT_TMP
406-
// cppcheck-suppress syntaxError
407402
case MOUNT_TMP:
408403
return "tmp";
409404
#endif
410405
#ifdef MOUNT_UFS
411-
// cppcheck-suppress syntaxError
412406
case MOUNT_UFS:
413407
return "ufs";
414408
#endif
415409
#ifdef MOUNT_NFS
416-
// cppcheck-suppress syntaxError
417410
case MOUNT_NFS:
418411
return "nfs";
419412
#endif
420413
#ifdef MOUNT_MSDOS
421-
// cppcheck-suppress syntaxError
422414
case MOUNT_MSDOS:
423415
return "msdos";
424416
#endif
425417
#ifdef MOUNT_LFS
426-
// cppcheck-suppress syntaxError
427418
case MOUNT_LFS:
428419
return "lfs";
429420
#endif
430421
#ifdef MOUNT_LOFS
431-
// cppcheck-suppress syntaxError
432422
case MOUNT_LOFS:
433423
return "lofs";
434424
#endif
435425
#ifdef MOUNT_FDESC
436-
// cppcheck-suppress syntaxError
437426
case MOUNT_FDESC:
438427
return "fdesc";
439428
#endif
440429
#ifdef MOUNT_PORTAL
441-
// cppcheck-suppress syntaxError
442430
case MOUNT_PORTAL:
443431
return "portal";
444432
#endif
445433
#ifdef MOUNT_NULL
446-
// cppcheck-suppress syntaxError
447434
case MOUNT_NULL:
448435
return "null";
449436
#endif
450437
#ifdef MOUNT_UMAP
451-
// cppcheck-suppress syntaxError
452438
case MOUNT_UMAP:
453439
return "umap";
454440
#endif
455441
#ifdef MOUNT_KERNFS
456-
// cppcheck-suppress syntaxError
457442
case MOUNT_KERNFS:
458443
return "kernfs";
459444
#endif
460445
#ifdef MOUNT_PROCFS
461-
// cppcheck-suppress syntaxError
462446
case MOUNT_PROCFS:
463447
return "procfs";
464448
#endif
465449
#ifdef MOUNT_AFS
466-
// cppcheck-suppress syntaxError
467450
case MOUNT_AFS:
468451
return "afs";
469452
#endif
470453
#ifdef MOUNT_CD9660
471-
// cppcheck-suppress syntaxError
472454
case MOUNT_CD9660:
473455
return "cd9660";
474456
#endif
475457
#ifdef MOUNT_UNION
476-
// cppcheck-suppress syntaxError
477458
case MOUNT_UNION:
478459
return "union";
479460
#endif
480461
#ifdef MOUNT_DEVFS
481-
// cppcheck-suppress syntaxError
482462
case MOUNT_DEVFS:
483463
return "devfs";
484464
#endif
485465
#ifdef MOUNT_EXT2FS
486-
// cppcheck-suppress syntaxError
487466
case MOUNT_EXT2FS:
488467
return "ext2fs";
489468
#endif

‎src/vfs/cpio/cpio.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,15 +387,12 @@ cpio_create_entry (struct vfs_class *me, struct vfs_s_super *super, struct stat
387387
case S_IFCHR:
388388
case S_IFBLK:
389389
#ifdef S_IFSOCK
390-
// cppcheck-suppress syntaxError
391390
case S_IFSOCK:
392391
#endif
393392
#ifdef S_IFIFO
394-
// cppcheck-suppress syntaxError
395393
case S_IFIFO:
396394
#endif
397395
#ifdef S_IFNAM
398-
// cppcheck-suppress syntaxError
399396
case S_IFNAM:
400397
#endif
401398
#ifdef HAVE_STRUCT_STAT_ST_RDEV

0 commit comments

Comments
 (0)