summaryrefslogtreecommitdiff
path: root/src/fr-command-lha.c
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-12-21 16:38:28 +0100
committerraveit65 <[email protected]>2021-01-07 18:37:10 +0100
commit98759f7bed3768ef150dcd41f97f87cbb84be8b1 (patch)
tree9d36f1a67229a67a117c1f9583dafbe9d1b55a8b /src/fr-command-lha.c
parentfacddb5353b18d19c8a5b4f62b11ac0f6e666724 (diff)
downloadengrampa-98759f7bed3768ef150dcd41f97f87cbb84be8b1.tar.bz2
engrampa-98759f7bed3768ef150dcd41f97f87cbb84be8b1.tar.xz
Remove cppcheck warnings about the variable scope can be reduced
Diffstat (limited to 'src/fr-command-lha.c')
-rw-r--r--src/fr-command-lha.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/fr-command-lha.c b/src/fr-command-lha.c
index 0adfcc1..9996bba 100644
--- a/src/fr-command-lha.c
+++ b/src/fr-command-lha.c
@@ -48,27 +48,29 @@ mktime_from_string (char *month,
char *mday,
char *time_or_year)
{
- static const char *months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
- struct tm tm = {0, };
- char **fields;
+ struct tm tm = {0, };
tm.tm_isdst = -1;
/* date */
if (month != NULL) {
+ static const char *months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
int i;
- for (i = 0; i < 12; i++)
+
+ for (i = 0; i < 12; i++) {
if (strcmp (months[i], month) == 0) {
tm.tm_mon = i;
break;
}
+ }
}
tm.tm_mday = atoi (mday);
if (strchr (time_or_year, ':') == NULL)
tm.tm_year = atoi (time_or_year) - 1900;
else {
+ char **fields;
time_t now;
struct tm *tm_now;
@@ -97,7 +99,7 @@ split_line_lha (char *line)
{
char **fields;
int n_fields = 7;
- const char *scan, *field_end;
+ const char *scan;
int i;
fields = g_new0 (char *, n_fields + 1);
@@ -128,8 +130,9 @@ split_line_lha (char *line)
scan = eat_spaces (line);
for (; i < n_fields; i++) {
- field_end = strchr (scan, ' ');
- if (field_end != NULL) {
+ const char *field_end;
+
+ if (NULL != (field_end = strchr (scan, ' '))) {
fields[i] = g_strndup (scan, field_end - scan);
scan = eat_spaces (field_end);
}