From bd69b8dd31d020d06e3dd36b05dd6dda8d5515c8 Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Wed, 9 Oct 2013 15:15:00 +0300 Subject: [PATCH] Suppress cppcheck errors Signed-off-by: Slava Zanko --- lib/widget/input_complete.c | 1 + src/editor/editcmd.c | 8 ++++---- src/filemanager/boxes.c | 9 +++++++-- src/filemanager/mountlist.c | 22 ++++++++++++++++++++++ src/vfs/cpio/cpio.c | 3 +++ src/vfs/smbfs/helpers/lib/system.c | 1 + src/vfs/smbfs/helpers/lib/util.c | 1 + 7 files changed, 39 insertions(+), 6 deletions(-) diff --git a/lib/widget/input_complete.c b/lib/widget/input_complete.c index be2759d59..9ca47ef52 100644 --- a/lib/widget/input_complete.c +++ b/lib/widget/input_complete.c @@ -569,6 +569,7 @@ command_completion_function (const char *_text, int state, input_complete_t flag }; char *p, *found; + /* cppcheck-suppress uninitvar */ SHOW_C_CTX ("command_completion_function"); if (!(flags & INPUT_COMPLETE_COMMANDS)) diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c index 76beec962..f333ef949 100644 --- a/src/editor/editcmd.c +++ b/src/editor/editcmd.c @@ -1566,7 +1566,7 @@ edit_show_numbers_cmd (WDialog * h) void edit_save_mode_cmd (void) { - char *str_result; + char *str_result = NULL; const char *str[] = { N_("&Quick save"), @@ -3201,9 +3201,9 @@ edit_block_process_cmd (WEdit * edit, int macro_number) void edit_mail_dialog (WEdit * edit) { - char *tmail_to; - char *tmail_subject; - char *tmail_cc; + char *tmail_to = NULL; + char *tmail_subject = NULL; + char *tmail_cc = NULL; static char *mail_cc_last = 0; static char *mail_subject_last = 0; diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c index f2cc4ffed..f932f5273 100644 --- a/src/filemanager/boxes.c +++ b/src/filemanager/boxes.c @@ -508,6 +508,7 @@ configure_box (void) #endif if (quick_dialog (&qdlg) == B_ENTER) + /* cppcheck-suppress uninitvar */ old_esc_mode_timeout = atoi (time_out_new); g_free (time_out_new); @@ -630,8 +631,8 @@ panel_listing_box (WPanel * panel, char **userp, char **minip, int *use_msformat { int mini_user_status; - char *panel_user_format; - char *mini_user_format; + char *panel_user_format = NULL; + char *mini_user_format = NULL; const char *cp; /* Controls whether the array strings have been translated */ @@ -1013,6 +1014,7 @@ configure_vfs (void) if (quick_dialog (&qdlg) != B_CANCEL) { + /* cppcheck-suppress uninitvar */ vfs_timeout = atoi (ret_timeout); g_free (ret_timeout); @@ -1020,9 +1022,12 @@ configure_vfs (void) vfs_timeout = 10; #ifdef ENABLE_VFS_FTP g_free (ftpfs_anonymous_passwd); + /* cppcheck-suppress uninitvar */ ftpfs_anonymous_passwd = ret_passwd; g_free (ftpfs_proxy_host); + /* cppcheck-suppress uninitvar */ ftpfs_proxy_host = ret_ftp_proxy; + /* cppcheck-suppress uninitvar */ ftpfs_directory_timeout = atoi (ret_directory_timeout); g_free (ret_directory_timeout); #endif diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c index 946df1a11..2ef19817e 100644 --- a/src/filemanager/mountlist.c +++ b/src/filemanager/mountlist.c @@ -397,86 +397,107 @@ fstype_to_string (short int t) switch (t) { #ifdef MOUNT_PC + /* cppcheck-suppress syntaxError */ case MOUNT_PC: return "pc"; #endif #ifdef MOUNT_MFS + /* cppcheck-suppress syntaxError */ case MOUNT_MFS: return "mfs"; #endif #ifdef MOUNT_LO + /* cppcheck-suppress syntaxError */ case MOUNT_LO: return "lo"; #endif #ifdef MOUNT_TFS + /* cppcheck-suppress syntaxError */ case MOUNT_TFS: return "tfs"; #endif #ifdef MOUNT_TMP + /* cppcheck-suppress syntaxError */ case MOUNT_TMP: return "tmp"; #endif #ifdef MOUNT_UFS + /* cppcheck-suppress syntaxError */ case MOUNT_UFS: return "ufs"; #endif #ifdef MOUNT_NFS + /* cppcheck-suppress syntaxError */ case MOUNT_NFS: return "nfs"; #endif #ifdef MOUNT_MSDOS + /* cppcheck-suppress syntaxError */ case MOUNT_MSDOS: return "msdos"; #endif #ifdef MOUNT_LFS + /* cppcheck-suppress syntaxError */ case MOUNT_LFS: return "lfs"; #endif #ifdef MOUNT_LOFS + /* cppcheck-suppress syntaxError */ case MOUNT_LOFS: return "lofs"; #endif #ifdef MOUNT_FDESC + /* cppcheck-suppress syntaxError */ case MOUNT_FDESC: return "fdesc"; #endif #ifdef MOUNT_PORTAL + /* cppcheck-suppress syntaxError */ case MOUNT_PORTAL: return "portal"; #endif #ifdef MOUNT_NULL + /* cppcheck-suppress syntaxError */ case MOUNT_NULL: return "null"; #endif #ifdef MOUNT_UMAP + /* cppcheck-suppress syntaxError */ case MOUNT_UMAP: return "umap"; #endif #ifdef MOUNT_KERNFS + /* cppcheck-suppress syntaxError */ case MOUNT_KERNFS: return "kernfs"; #endif #ifdef MOUNT_PROCFS + /* cppcheck-suppress syntaxError */ case MOUNT_PROCFS: return "procfs"; #endif #ifdef MOUNT_AFS + /* cppcheck-suppress syntaxError */ case MOUNT_AFS: return "afs"; #endif #ifdef MOUNT_CD9660 + /* cppcheck-suppress syntaxError */ case MOUNT_CD9660: return "cd9660"; #endif #ifdef MOUNT_UNION + /* cppcheck-suppress syntaxError */ case MOUNT_UNION: return "union"; #endif #ifdef MOUNT_DEVFS + /* cppcheck-suppress syntaxError */ case MOUNT_DEVFS: return "devfs"; #endif #ifdef MOUNT_EXT2FS + /* cppcheck-suppress syntaxError */ case MOUNT_EXT2FS: return "ext2fs"; #endif @@ -1138,6 +1159,7 @@ read_file_system_list (int need_fs_type) mtail = &me->me_next; } } + closedir (dirp); } #endif /* MOUNTED_INTERIX_STATVFS */ diff --git a/src/vfs/cpio/cpio.c b/src/vfs/cpio/cpio.c index ec79f5973..1075ea37d 100644 --- a/src/vfs/cpio/cpio.c +++ b/src/vfs/cpio/cpio.c @@ -380,12 +380,15 @@ cpio_create_entry (struct vfs_class *me, struct vfs_s_super *super, struct stat case S_IFCHR: case S_IFBLK: #ifdef S_IFSOCK + /* cppcheck-suppress syntaxError */ case S_IFSOCK: #endif #ifdef S_IFIFO + /* cppcheck-suppress syntaxError */ case S_IFIFO: #endif #ifdef S_IFNAM + /* cppcheck-suppress syntaxError */ case S_IFNAM: #endif if ((st->st_size != 0) && (st->st_rdev == 0x0001)) diff --git a/src/vfs/smbfs/helpers/lib/system.c b/src/vfs/smbfs/helpers/lib/system.c index 70d88ecf0..c3f508a41 100644 --- a/src/vfs/smbfs/helpers/lib/system.c +++ b/src/vfs/smbfs/helpers/lib/system.c @@ -103,6 +103,7 @@ sys_select (int maxfd, fd_set * fds, struct timeval *tval) #else /* !NO_SELECT */ int sys_select (int maxfd, fd_set * fds, struct timeval *tval) +/* cppcheck-suppress syntaxError */ { #ifdef USE_POLL struct pollfd pfd[256]; diff --git a/src/vfs/smbfs/helpers/lib/util.c b/src/vfs/smbfs/helpers/lib/util.c index 939cdc018..3d20dbea0 100644 --- a/src/vfs/smbfs/helpers/lib/util.c +++ b/src/vfs/smbfs/helpers/lib/util.c @@ -1829,6 +1829,7 @@ get_myname (char *my_name, struct in_addr * ip) struct hostent *hp; pstring hostname; + /* cppcheck-suppress uninitvar */ *hostname = 0; /* get my host name */