diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-03-30 15:41:31 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-03-30 15:41:31 -0400 |
| commit | 8f2b14197e7db279434c5b063b755d1121c137de (patch) | |
| tree | e6d335d41fbe085fccac277a5565dd089267db32 /runtime/map.c | |
| parent | 4407fecb4b4e7466b256a26d1bfd63333bf367a2 (diff) | |
| parent | 267a544424be10825c57ea3eaa4d908c818211c7 (diff) | |
| download | systemtap-steved-8f2b14197e7db279434c5b063b755d1121c137de.tar.gz systemtap-steved-8f2b14197e7db279434c5b063b755d1121c137de.tar.xz systemtap-steved-8f2b14197e7db279434c5b063b755d1121c137de.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
aclocal.m4
configure
testsuite/aclocal.m4
Also:
2009-03-30 Dave Brolley <brolley@redhat.com>
* nsscommon.c (nssError): Handle SEC_ERROR_BAD_SIGNATURE.
2009-03-30 Dave Brolley <brolley@redhat.com>
* modverify.c (verify_it): Print a message if the module may have been
tampered with.
Diffstat (limited to 'runtime/map.c')
| -rw-r--r-- | runtime/map.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/runtime/map.c b/runtime/map.c index de25d6f3..190ba91b 100644 --- a/runtime/map.c +++ b/runtime/map.c @@ -38,27 +38,16 @@ static int int64_eq_p (int64_t key1, int64_t key2) static void str_copy(char *dest, char *src) { - int len = 0; - if (src) { - len = strlen(src); - if (len > MAP_STRING_LENGTH - 1) - len = MAP_STRING_LENGTH - 1; - memcpy (dest, src, len); - } - dest[len] = 0; + if (src) + strlcpy(dest, src, MAP_STRING_LENGTH); + else + *dest = 0; } static void str_add(void *dest, char *val) { char *dst = (char *)dest; - int len = strlen(val); - int len1 = strlen(dst); - int num = MAP_STRING_LENGTH - 1 - len1; - - if (len > num) - len = num; - memcpy (&dst[len1], val, len); - dst[len + len1] = 0; + strlcat(dst, val, MAP_STRING_LENGTH); } static int str_eq_p (char *key1, char *key2) |