aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-10-27 10:11:22 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-10-27 10:11:22 +0000
commitb0cdcf40ab15cdad5efea3602bc0665fe4aefb88 (patch)
tree5a42d42ca3bb5bb5293f4a6bdbaa3028fc3f7df9 /epan
parent83b716efc7de74f17d762f8d4209002d26fcac31 (diff)
get rid of the last two strcpy from epan/dissectors
svn path=/trunk/; revision=16342
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-nfs.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 0ed98739f8..8c343d48fd 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -744,8 +744,7 @@ nfs_full_name_snoop(nfs_name_snoop_t *nns, int *len, unsigned char **name, unsig
*name = g_malloc((*len)+1);
*pos = *name;
- strcpy(*pos, nns->name);
- *pos += nns->name_len;
+ *pos += g_snprintf(*pos, (*len)+1, "%s", nns->name);
return;
}
@@ -759,13 +758,7 @@ nfs_full_name_snoop(nfs_name_snoop_t *nns, int *len, unsigned char **name, unsig
nfs_full_name_snoop(parent_nns, len, name, pos);
if(*name){
/* make sure components are '/' separated */
- if( (*pos)[-1] != '/'){
- **pos='/';
- (*pos)++;
- **pos=0;
- }
- strcpy(*pos, nns->name);
- *pos += nns->name_len;
+ *pos += g_snprintf(*pos, (*len)+1, "%s%s", ((*pos)[-1]!='/')?"/":"", nns->name);
}
return;
}