diff options
author | Dan McGee <dan@archlinux.org> | 2007-09-23 12:20:48 -0500 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2007-09-23 12:20:48 -0500 |
commit | d3c80030201b555efba2f31811cff627a3fdeaf8 (patch) | |
tree | f02cd6d1f11a3510732a97c8feffed8528cb81de | |
parent | 443950b7e9c40493a184d55caaa71c2b4daa3ffd (diff) |
alpm: removed unused strtoupper wrapper, remove installeddate on parse_descfile
installdate should never be present in a package descfile, so get rid of it.
With the last commit, we also don't need the util strtoupper function.
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r-- | lib/libalpm/package.c | 2 | ||||
-rw-r--r-- | lib/libalpm/util.c | 13 | ||||
-rw-r--r-- | lib/libalpm/util.h | 1 |
3 files changed, 0 insertions, 16 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index f8cba1fc..64a63b96 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -867,8 +867,6 @@ static int parse_descfile(const char *descfile, pmpkg_t *info) info->licenses = alpm_list_add(info->licenses, strdup(ptr)); } else if(!strcmp(key, "builddate")) { strncpy(info->builddate, ptr, sizeof(info->builddate)); - } else if(!strcmp(key, "installdate")) { - strncpy(info->installdate, ptr, sizeof(info->installdate)); } else if(!strcmp(key, "packager")) { strncpy(info->packager, ptr, sizeof(info->packager)); } else if(!strcmp(key, "arch")) { diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index b1c3a402..9d4adb2d 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -251,19 +251,6 @@ int _alpm_copyfile(const char *src, const char *dest) return(0); } -/* Convert a string to uppercase -*/ -char *_alpm_strtoupper(char *str) -{ - char *ptr = str; - - while(*ptr) { - (*ptr) = toupper(*ptr); - ptr++; - } - return(str); -} - /* Trim whitespace and newlines from a string */ char *_alpm_strtrim(char *str) diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 3a57fe4a..acf2eb3b 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -43,7 +43,6 @@ int _alpm_makepath(const char *path); int _alpm_copyfile(const char *src, const char *dest); -char *_alpm_strtoupper(char *str); char *_alpm_strtrim(char *str); char *_alpm_strreplace(const char *str, const char *needle, const char *replace); int _alpm_lckmk(); |