# HG changeset patch # User Luke Schierer # Date 1177548329 0 # Node ID f9597f375b079126bf5a8f9bee00cd190be5f0e0 # Parent 8ae1ef832c551d49deff8305ee3011d9b82bbd8c# Parent 728b4288c0619bcf7e76901fb3d8688456621ff7 merge of '0b7fa990cc064a8d716ba2a8700c6a8786b9f65e' and '10a3b2875c4421cf84b22f91b68f0abf05368da1' diff -r 8ae1ef832c55 -r f9597f375b07 libpurple/plugins/tcl/tcl_ref.c --- a/libpurple/plugins/tcl/tcl_ref.c Thu Apr 26 00:26:44 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_ref.c Thu Apr 26 00:45:29 2007 +0000 @@ -114,17 +114,18 @@ char *ptr; PurpleStringref *type; void *value; - int magicnumber = strlen("purple-"); + static const char const *prefix = "purple-"; + static const int prefixlen = sizeof(prefix) - 1; - if (strlen(bytes) < magicnumber - || strncmp(bytes, "purple-", magicnumber) + if (strlen(bytes) < prefixlen + || strncmp(bytes, prefix, prefixlen) || (ptr = strchr(bytes, ':')) == NULL - || (ptr - bytes) == magicnumber) + || (ptr - bytes) == prefixlen) goto badobject; /* Bad Ethan */ *ptr = '\0'; - type = purple_stringref_new(bytes + magicnumber); + type = purple_stringref_new(bytes + prefixlen); *ptr = ':'; ptr++;