astyle sprintflst.c

pull/649/head
Michael Black W9MDB 2021-03-06 14:49:34 -06:00
rodzic 6577c0f564
commit 2fb96a34b9
1 zmienionych plików z 31 dodań i 25 usunięć

Wyświetl plik

@ -39,12 +39,14 @@
// just doing a warning message for now // just doing a warning message for now
// eventually should make this -RIG_EINTERNAL // eventually should make this -RIG_EINTERNAL
int check_buffer_overflow(char *str,int len,int nlen) int check_buffer_overflow(char *str, int len, int nlen)
{ {
if (len +1 >= nlen) if (len + 1 >= nlen)
{ {
rig_debug(RIG_DEBUG_ERR, "%s: buffer overflow, len=%u, nlen=%d, str='%s'\n", __func__, len, nlen, str); rig_debug(RIG_DEBUG_ERR, "%s: buffer overflow, len=%u, nlen=%d, str='%s'\n",
__func__, len, nlen, str);
} }
return RIG_OK; return RIG_OK;
} }
@ -72,7 +74,7 @@ int rig_sprintf_vfo(char *str, int nlen, vfo_t vfo)
} }
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -102,7 +104,7 @@ int rig_sprintf_mode(char *str, int nlen, rmode_t mode)
len += strlen(ms) + 1; len += strlen(ms) + 1;
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -150,7 +152,7 @@ int rig_sprintf_ant(char *str, int nlen, ant_t ant)
} }
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -180,7 +182,7 @@ int rig_sprintf_func(char *str, int nlen, setting_t func)
len += strlen(ms) + 1; len += strlen(ms) + 1;
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -210,7 +212,7 @@ int rot_sprintf_func(char *str, int nlen, setting_t func)
len += strlen(ms) + 1; len += strlen(ms) + 1;
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -240,7 +242,7 @@ int rig_sprintf_level(char *str, int nlen, setting_t level)
len += strlen(ms) + 1; len += strlen(ms) + 1;
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -270,7 +272,7 @@ int rot_sprintf_level(char *str, int nlen, setting_t level)
len += strlen(ms) + 1; len += strlen(ms) + 1;
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -300,7 +302,7 @@ int amp_sprintf_level(char *str, int nlen, setting_t level)
len += strlen(ms) + 1; len += strlen(ms) + 1;
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -341,12 +343,13 @@ int sprintf_level_ext(char *str, int nlen, const struct confparams *extlevels)
} }
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
int rig_sprintf_level_gran(char *str, int nlen, setting_t level, const gran_t *gran) int rig_sprintf_level_gran(char *str, int nlen, setting_t level,
const gran_t *gran)
{ {
int i, len = 0; int i, len = 0;
@ -398,12 +401,13 @@ int rig_sprintf_level_gran(char *str, int nlen, setting_t level, const gran_t *g
} }
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
int rot_sprintf_level_gran(char *str, int nlen, setting_t level, const gran_t *gran) int rot_sprintf_level_gran(char *str, int nlen, setting_t level,
const gran_t *gran)
{ {
int i, len = 0; int i, len = 0;
@ -455,7 +459,7 @@ int rot_sprintf_level_gran(char *str, int nlen, setting_t level, const gran_t *g
} }
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -485,7 +489,7 @@ int rig_sprintf_parm(char *str, int nlen, setting_t parm)
len += strlen(ms) + 1; len += strlen(ms) + 1;
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -515,12 +519,13 @@ int rot_sprintf_parm(char *str, int nlen, setting_t parm)
len += strlen(ms) + 1; len += strlen(ms) + 1;
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
int rig_sprintf_parm_gran(char *str, int nlen, setting_t parm, const gran_t *gran) int rig_sprintf_parm_gran(char *str, int nlen, setting_t parm,
const gran_t *gran)
{ {
int i, len = 0; int i, len = 0;
@ -572,12 +577,13 @@ int rig_sprintf_parm_gran(char *str, int nlen, setting_t parm, const gran_t *gra
} }
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
int rot_sprintf_parm_gran(char *str, int nlen, setting_t parm, const gran_t *gran) int rot_sprintf_parm_gran(char *str, int nlen, setting_t parm,
const gran_t *gran)
{ {
int i, len = 0; int i, len = 0;
@ -629,7 +635,7 @@ int rot_sprintf_parm_gran(char *str, int nlen, setting_t parm, const gran_t *gra
} }
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -659,7 +665,7 @@ int rig_sprintf_vfop(char *str, int nlen, vfo_op_t op)
len += strlen(ms) + 1; len += strlen(ms) + 1;
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -689,7 +695,7 @@ int rig_sprintf_scan(char *str, int nlen, scan_t rscan)
len += strlen(ms) + 1; len += strlen(ms) + 1;
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }
@ -717,7 +723,7 @@ int rot_sprintf_status(char *str, int nlen, rot_status_t status)
} }
} }
check_buffer_overflow(str,len,nlen); check_buffer_overflow(str, len, nlen);
return len; return len;
} }