Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=3dd6e1a9912153a6893a74998d200365a3f7fac9
commit 3dd6e1a9912153a6893a74998d200365a3f7fac9
Author: Michel Hermier <herm...@frugalware.org>
Date: Sun Nov 10 12:25:11 2013 +0100
libpacman: Make _pacman_pkg_splitname target argument const, and use
_pacman_basename to increase readbility.
diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c
index 36bd827..7d5d9d1 100644
--- a/lib/libpacman/package.c
+++ b/lib/libpacman/package.c
@@ -314,22 +314,14 @@ pmpkg_t *_pacman_pkg_isin(const char *needle, pmlist_t
*haystack)
return(NULL);
}
-int _pacman_pkg_splitname(char *target, char *name, char *version, int
witharch)
+int _pacman_pkg_splitname(const char *target, char *name, char *version, int
witharch)
{
- char tmp[PKG_FULLNAME_LEN+7];
+ char *tmp;
char *p, *q;
- if(target == NULL) {
- return(-1);
- }
-
- /* trim path name (if any) */
- if((p = strrchr(target, '/')) == NULL) {
- p = target;
- } else {
- p++;
+ if ((tmp = _pacman_basename(target)) == NULL) {
+ return -1;
}
- STRNCPY(tmp, p, PKG_FULLNAME_LEN+7);
/* trim file extension (if any) */
if((p = strstr(tmp, PM_EXT_PKG))) {
*p = 0;
diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h
index 06f5f87..8967fae 100644
--- a/lib/libpacman/package.h
+++ b/lib/libpacman/package.h
@@ -103,7 +103,7 @@ int _pacman_pkg_cmp(const void *p1, const void *p2);
int _pacman_pkg_is_valid(const pmpkg_t *pkg, const pmtrans_t *trans, const char
*pkgfile);
pmpkg_t *_pacman_pkg_load(const char *pkgfile);
pmpkg_t *_pacman_pkg_isin(const char *needle, pmlist_t *haystack);
-int _pacman_pkg_splitname(char *target, char *name, char *version, int
witharch);
+int _pacman_pkg_splitname(const char *target, char *name, char *version, int
witharch);
void *_pacman_pkg_getinfo(pmpkg_t *pkg, unsigned char parm);
pmlist_t *_pacman_pkg_getowners(char *filename);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
