未验证 提交 7988855f 编写于 作者: X xebd 提交者: GitHub

Merge pull request #64 from themiron/warn-fixes

warning fixes
......@@ -475,7 +475,7 @@ static void print_uptime(struct ap_session *ses, char *buf)
{
time_t uptime;
int day,hour,min,sec;
char time_str[14];
char time_str[24];
if (ses->stop_time)
uptime = ses->stop_time - ses->start_time;
......@@ -489,9 +489,9 @@ static void print_uptime(struct ap_session *ses, char *buf)
min = uptime / 60;
sec = uptime % 60;
if (day)
snprintf(time_str, 13, "%i.%02i:%02i:%02i", day, hour, min, sec);
snprintf(time_str, sizeof(time_str), "%i.%02i:%02i:%02i", day, hour, min, sec);
else
snprintf(time_str, 13, "%02i:%02i:%02i", hour, min, sec);
snprintf(time_str, sizeof(time_str), "%02i:%02i:%02i", hour, min, sec);
sprintf(buf, "%s", time_str);
}
......
......@@ -1514,7 +1514,7 @@ static void ipoe_serv_disc_timer(struct triton_timer_t *t)
{
struct ipoe_serv *serv = container_of(t, typeof(*serv), disc_timer);
struct timespec ts;
int delay, delay1 = INT_MAX, delay2 = INT_MAX, offer_delay;
int delay, delay1 = INT_MAX, delay2 = INT_MAX, offer_delay = 0;
clock_gettime(CLOCK_MONOTONIC, &ts);
......
......@@ -626,7 +626,7 @@ static void init(void)
{
int mcg_id;
if (system("modprobe -q ipoe"))
if (access("/sys/module/ipoe", F_OK) && system("modprobe -q ipoe"))
log_warn("failed to load ipoe module\n");
mcg_id = genl_resolve_mcg(IPOE_GENL_NAME, IPOE_GENL_MCG_PKT, &ipoe_genl_id);
......
......@@ -522,7 +522,7 @@ static void init(void)
{
int mcg_id;
if (system("modprobe -q vlan_mon"))
if (access("/sys/module/vlan_mon", F_OK) && system("modprobe -q vlan_mon"))
log_warn("failed to load vlan_mon module\n");
mcg_id = genl_resolve_mcg(VLAN_MON_GENL_NAME, VLAN_MON_GENL_MCG, &vlan_mon_genl_id);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册