Skip to content

Commit

Permalink
fix clang switch-default warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@vergoh
vergoh committed Jan 8, 2025
1 parent 4ac1de9 commit 0fcba71
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 4 deletions.
4 changes: 4 additions & 0 deletions src/common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ int printe(const PrintType type)
case PT_Error:
case PT_Config:
case PT_ShortMultiline:
default:
result = logprint(type);
break;
}
Expand All @@ -59,6 +60,7 @@ int printe(const PrintType type)
case PT_Info:
fprintf(output, "Info: %s\n", errorstring);
break;
default:
case PT_Infoless:
fprintf(output, "%s\n", errorstring);
break;
Expand Down Expand Up @@ -109,6 +111,7 @@ int logprint(const PrintType type)
strftime(timestamp, 22, DATETIMEFORMAT, localtime(&current));

switch (type) {
default:
case PT_Info:
case PT_Infoless:
snprintf(buffer, 1060, "[%s] %s\n", timestamp, errorstring);
Expand Down Expand Up @@ -157,6 +160,7 @@ int logprint(const PrintType type)
case PT_Info:
case PT_Infoless:
case PT_ShortMultiline:
default:
syslog(LOG_NOTICE, "%s", errorstring);
break;
}
Expand Down
3 changes: 3 additions & 0 deletions src/dbshow.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,7 @@ int showalert(const char *interface, const AlertOutput output, const AlertExit a
adata.datalist = NULL;

switch (type) {
default:
case AT_None:
return 0;
case AT_Hour:
Expand Down Expand Up @@ -1053,6 +1054,7 @@ int showalert(const char *interface, const AlertOutput output, const AlertExit a

// "limit" and "used" are always in either bytes or bytes/second
switch (condition) {
default:
case AC_None:
return 0;
case AC_RX:
Expand Down Expand Up @@ -1178,6 +1180,7 @@ void alertoutput(const alertdata *adata, const AlertOutput output, const AlertTy
}
if (adata->timestamp) {
switch (type) {
default:
case AT_None:
break;
case AT_Percentile:
Expand Down
5 changes: 1 addition & 4 deletions src/misc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,15 @@ void sighandler(int sig)

if (debug) {
switch (sig) {

case SIGHUP:
snprintf(errorstring, 1024, "DEBUG: SIGHUP (%d)", sig);
break;

case SIGTERM:
snprintf(errorstring, 1024, "DEBUG: SIGTERM (%d)", sig);
break;

case SIGINT:
snprintf(errorstring, 1024, "DEBUG: SIGINT (%d)", sig);
break;

default:
snprintf(errorstring, 1024, "DEBUG: Unknown signal %d", sig);
break;
Expand Down Expand Up @@ -444,6 +440,7 @@ int issametimeslot(const ListType listtype, const time_t entry, const time_t upd
}
break;
case LT_None:
default:
return 0;
}

Expand Down
52 changes: 52 additions & 0 deletions tests/dbsql_tests.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1327,6 +1327,8 @@ START_TEST(db_getdata_range_can_get_months_without_range_defined)
strftime(timestamp, 64, "%Y-%m-%d", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2000-06-01");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1362,6 +1364,8 @@ START_TEST(db_getdata_range_can_get_months_with_range_matching_existing_data)
strftime(timestamp, 64, "%Y-%m-%d", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2000-06-01");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1397,6 +1401,8 @@ START_TEST(db_getdata_range_can_get_months_with_range_past_existing_data)
strftime(timestamp, 64, "%Y-%m-%d", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2000-06-01");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1432,6 +1438,8 @@ START_TEST(db_getdata_range_can_get_months_with_range_limiting_begin_and_end)
strftime(timestamp, 64, "%Y-%m-%d", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2000-04-01");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1467,6 +1475,8 @@ START_TEST(db_getdata_range_can_get_months_with_range_limiting_begin)
strftime(timestamp, 64, "%Y-%m-%d", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2000-06-01");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1502,6 +1512,8 @@ START_TEST(db_getdata_range_can_get_months_with_range_limiting_begin_with_limit)
strftime(timestamp, 64, "%Y-%m-%d", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2000-05-01");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1537,6 +1549,8 @@ START_TEST(db_getdata_range_can_get_months_with_range_limiting_end)
strftime(timestamp, 64, "%Y-%m-%d", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2000-04-01");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1572,6 +1586,8 @@ START_TEST(db_getdata_range_can_get_months_with_range_limiting_end_with_limit)
strftime(timestamp, 64, "%Y-%m-%d", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2000-04-01");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1603,6 +1619,8 @@ START_TEST(db_getdata_range_can_get_months_with_range_on_same_month)
strftime(timestamp, 64, "%Y-%m-%d", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2000-04-01");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1638,6 +1656,8 @@ START_TEST(db_getdata_range_can_get_months_with_range_past_first_day_of_month)
strftime(timestamp, 64, "%Y-%m-%d", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2000-05-01");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1691,6 +1711,8 @@ START_TEST(db_getdata_range_can_get_hours_without_range_defined)
strftime(timestamp, 64, "%Y-%m-%d %H:%M", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2002-02-04 23:00");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1726,6 +1748,8 @@ START_TEST(db_getdata_range_can_get_hours_with_range_matching_existing_data)
strftime(timestamp, 64, "%Y-%m-%d %H:%M", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2002-02-04 23:00");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1761,6 +1785,8 @@ START_TEST(db_getdata_range_can_get_hours_with_range_past_existing_data)
strftime(timestamp, 64, "%Y-%m-%d %H:%M", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2002-02-04 23:00");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1796,6 +1822,8 @@ START_TEST(db_getdata_range_can_get_hours_with_range_limiting_begin_and_end)
strftime(timestamp, 64, "%Y-%m-%d %H:%M", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2002-02-03 17:00");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1831,6 +1859,8 @@ START_TEST(db_getdata_range_can_get_hours_with_range_limiting_begin)
strftime(timestamp, 64, "%Y-%m-%d %H:%M", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2002-02-04 23:00");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1866,6 +1896,8 @@ START_TEST(db_getdata_range_can_get_hours_with_range_limiting_begin_with_limit)
strftime(timestamp, 64, "%Y-%m-%d %H:%M", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2002-02-03 06:00");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1901,6 +1933,8 @@ START_TEST(db_getdata_range_can_get_hours_with_range_limiting_end)
strftime(timestamp, 64, "%Y-%m-%d %H:%M", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2002-02-02 20:00");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1936,6 +1970,8 @@ START_TEST(db_getdata_range_can_get_hours_with_range_limiting_end_with_limit)
strftime(timestamp, 64, "%Y-%m-%d %H:%M", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2002-02-02 20:00");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -1967,6 +2003,8 @@ START_TEST(db_getdata_range_can_get_hours_with_range_on_same_hour)
strftime(timestamp, 64, "%Y-%m-%d %H:%M", localtime(&datalist_i->timestamp));
ck_assert_str_eq(timestamp, "2002-02-02 20:00");
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -2018,6 +2056,8 @@ START_TEST(db_getdata_range_with_merged_interfaces)
ck_assert_int_eq(datalist_i->rx, 80);
ck_assert_int_eq(datalist_i->tx, 180);
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -2073,6 +2113,8 @@ START_TEST(db_getdata_range_with_long_merged_interfaces)
ck_assert_int_eq(datalist_i->rx, 260);
ck_assert_int_eq(datalist_i->tx, 520);
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand All @@ -2092,6 +2134,8 @@ START_TEST(db_getdata_range_with_long_merged_interfaces)
ck_assert_int_eq(datalist_i->rx, 240);
ck_assert_int_eq(datalist_i->tx, 480);
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -2135,6 +2179,8 @@ START_TEST(db_addtraffic_without_monthrotate)
ck_assert_int_eq(datalist_i->rx, 20);
ck_assert_int_eq(datalist_i->tx, 40);
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -2184,6 +2230,8 @@ START_TEST(db_addtraffic_with_monthrotate)
ck_assert_int_eq(datalist_i->rx, 14);
ck_assert_int_eq(datalist_i->tx, 28);
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -2229,6 +2277,8 @@ START_TEST(db_addtraffic_without_monthrotate_utc)
ck_assert_int_eq(datalist_i->rx, 20);
ck_assert_int_eq(datalist_i->tx, 40);
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down Expand Up @@ -2280,6 +2330,8 @@ START_TEST(db_addtraffic_with_monthrotate_utc)
ck_assert_int_eq(datalist_i->rx, 14);
ck_assert_int_eq(datalist_i->tx, 28);
break;
default:
break;
}
datalist_i = datalist_i->next;
i++;
Expand Down

0 comments on commit 0fcba71

Please sign in to comment.