ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

pkg: get rid of PKG_LOCAL_COPY() since it was only used in one place

pull/29/head
William Pitcock 2012-05-11 13:59:18 -05:00
parent 56fbf25c8a
commit bb41d143cc
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg.c
View File

@ -337,6 +337,7 @@ int
pkg_compare_version(const char *a, const char *b) pkg_compare_version(const char *a, const char *b)
{ {
char oldch1, oldch2; char oldch1, oldch2;
char buf1[BUFSIZ], buf2[BUFSIZ];
char *str1, *str2; char *str1, *str2;
char *one, *two; char *one, *two;
int ret; int ret;
@ -346,11 +347,11 @@ pkg_compare_version(const char *a, const char *b)
if (!strcasecmp(a, b)) if (!strcasecmp(a, b))
return 0; return 0;
str1 = PKG_LOCAL_COPY(a); strlcpy(buf1, a, sizeof buf1);
str2 = PKG_LOCAL_COPY(b); strlcpy(buf2, b, sizeof buf2);
one = str1; one = str1 = buf1;
two = str2; two = str2 = buf2;
while (*one && *two) while (*one && *two)
{ {

3
pkg.h
View File

@ -56,9 +56,6 @@ typedef struct pkg_fragment_ pkg_fragment_t;
#define PKG_FOREACH_LIST_ENTRY_SAFE(head, nextiter, value) \ #define PKG_FOREACH_LIST_ENTRY_SAFE(head, nextiter, value) \
for ((value) = (head), (nextiter) = (head) != NULL ? (head)->next : NULL; (value) != NULL; (value) = (nextiter), (nextiter) = (nextiter) != NULL ? (nextiter)->next : NULL) for ((value) = (head), (nextiter) = (head) != NULL ? (head)->next : NULL; (value) != NULL; (value) = (nextiter), (nextiter) = (nextiter) != NULL ? (nextiter)->next : NULL)
#define PKG_LOCAL_COPY(a) \
strcpy(alloca(strlen(a) + 1), a)
#define PKG_MIN(a,b) (((a) < (b)) ? (a) : (b)) #define PKG_MIN(a,b) (((a) < (b)) ? (a) : (b))
#define PKG_MAX(a,b) (((a) > (b)) ? (a) : (b)) #define PKG_MAX(a,b) (((a) > (b)) ? (a) : (b))