mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 20:20:07 +00:00
strncpy to ast_copy_string
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6867 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -77,7 +77,7 @@ static void dump_string(char *output, int maxlen, void *value, int len)
|
|||||||
maxlen--;
|
maxlen--;
|
||||||
if (maxlen > len)
|
if (maxlen > len)
|
||||||
maxlen = len;
|
maxlen = len;
|
||||||
strncpy(output,value, maxlen);
|
ast_copy_string(output, value, maxlen);
|
||||||
output[maxlen] = '\0';
|
output[maxlen] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -92,7 +92,7 @@ static void dump_prefs(char *output, int maxlen, void *value, int len)
|
|||||||
if (maxlen > len)
|
if (maxlen > len)
|
||||||
maxlen = len;
|
maxlen = len;
|
||||||
|
|
||||||
strncpy(output,value, maxlen);
|
ast_copy_string(output, value, maxlen);
|
||||||
output[maxlen] = '\0';
|
output[maxlen] = '\0';
|
||||||
|
|
||||||
ast_codec_pref_convert(&pref, output, total_len, 0);
|
ast_codec_pref_convert(&pref, output, total_len, 0);
|
||||||
@@ -312,7 +312,7 @@ static void dump_prov_ies(char *output, int maxlen, unsigned char *iedata, int l
|
|||||||
if (prov_ies[x].dump) {
|
if (prov_ies[x].dump) {
|
||||||
prov_ies[x].dump(interp, (int)sizeof(interp), iedata + 2, ielen);
|
prov_ies[x].dump(interp, (int)sizeof(interp), iedata + 2, ielen);
|
||||||
snprintf(tmp, (int)sizeof(tmp), " %-15.15s : %s\n", prov_ies[x].name, interp);
|
snprintf(tmp, (int)sizeof(tmp), " %-15.15s : %s\n", prov_ies[x].name, interp);
|
||||||
strncpy(output, tmp, maxlen - 1);
|
ast_copy_string(output, tmp, maxlen);
|
||||||
maxlen -= strlen(output); output += strlen(output);
|
maxlen -= strlen(output); output += strlen(output);
|
||||||
} else {
|
} else {
|
||||||
if (ielen)
|
if (ielen)
|
||||||
@@ -320,7 +320,7 @@ static void dump_prov_ies(char *output, int maxlen, unsigned char *iedata, int l
|
|||||||
else
|
else
|
||||||
strcpy(interp, "Present");
|
strcpy(interp, "Present");
|
||||||
snprintf(tmp, (int)sizeof(tmp), " %-15.15s : %s\n", prov_ies[x].name, interp);
|
snprintf(tmp, (int)sizeof(tmp), " %-15.15s : %s\n", prov_ies[x].name, interp);
|
||||||
strncpy(output, tmp, maxlen - 1);
|
ast_copy_string(output, tmp, maxlen);
|
||||||
maxlen -= strlen(output); output += strlen(output);
|
maxlen -= strlen(output); output += strlen(output);
|
||||||
}
|
}
|
||||||
found++;
|
found++;
|
||||||
@@ -328,7 +328,7 @@ static void dump_prov_ies(char *output, int maxlen, unsigned char *iedata, int l
|
|||||||
}
|
}
|
||||||
if (!found) {
|
if (!found) {
|
||||||
snprintf(tmp, (int)sizeof(tmp), " Unknown Prov IE %03d : Present\n", ie);
|
snprintf(tmp, (int)sizeof(tmp), " Unknown Prov IE %03d : Present\n", ie);
|
||||||
strncpy(output, tmp, maxlen - 1);
|
ast_copy_string(output, tmp, maxlen);
|
||||||
maxlen -= strlen(output); output += strlen(output);
|
maxlen -= strlen(output); output += strlen(output);
|
||||||
}
|
}
|
||||||
iedata += (2 + ielen);
|
iedata += (2 + ielen);
|
||||||
|
Reference in New Issue
Block a user