diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-04-21 17:47:44 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-21 17:47:44 +0000 |
commit | 491c64457a843b7a158f290db912d62b339d5773 (patch) | |
tree | 5eb15904009fb328f1cb0fa5cda55860658ac417 /enum.c | |
parent | 23c6d5eff882fad75dfffe49b9dc08d27279e23c (diff) |
replace strncpy with ast_copy_string and fix the -1 offset which
is not needed now.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22015 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'enum.c')
-rw-r--r-- | enum.c | 14 |
1 files changed, 3 insertions, 11 deletions
@@ -412,11 +412,7 @@ int ast_get_enum(struct ast_channel *chan, const char *number, char *dst, int ds int i = 0; int z = 0; - if (number[0] == 'n') { - strncpy(naptrinput, number+1, sizeof(naptrinput)); - } else { - strncpy(naptrinput, number, sizeof(naptrinput)); - } + ast_copy_string(naptrinput, number[0] == 'n' ? number+1 : number, sizeof(naptrinput)); context.naptrinput = naptrinput; /* The number */ context.dst = dst; /* Return string */ @@ -487,11 +483,7 @@ int ast_get_enum(struct ast_channel *chan, const char *number, char *dst, int ds } else { s = s->next; } - if (suffix != NULL) { - strncpy(tmp + newpos, suffix, sizeof(tmp) - newpos - 1); - } else if (s) { - strncpy(tmp + newpos, s->toplev, sizeof(tmp) - newpos - 1); - } + ast_copy_string(tmp + newpos, suffix ? suffix : s->toplev, sizeof(tmp) - newpos); ast_mutex_unlock(&enumlock); if (!s) break; @@ -600,7 +592,7 @@ int ast_get_txt(struct ast_channel *chan, const char *number, char *dst, int dst s = s->next; } if (s) { - strncpy(tmp + newpos, s->toplev, sizeof(tmp) - newpos - 1); + ast_copy_string(tmp + newpos, s->toplev, sizeof(tmp) - newpos); } ast_mutex_unlock(&enumlock); if (!s) |