bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backport from pacman 2.9.5 (splitdep returns an int)

Browse source
This commit is contained in:
Aurelien Foret 2005-03-26 20:23:03 +00:00
parent 7f46a9c442
commit d77f8be802
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/libalpm/deps.c
View file

@ -460,13 +460,13 @@ PMList *checkdeps(pmdb_t *db, unsigned short op, PMList *packages)
return(baddeps); return(baddeps);
} }
void splitdep(char *depstr, pmdepend_t *depend) int splitdep(char *depstr, pmdepend_t *depend)
{ {
char *str = NULL; char *str = NULL;
char *ptr = NULL; char *ptr = NULL;
if(depstr == NULL || depend == NULL) { if(depstr == NULL || depend == NULL) {
return; return(-1);
} }
depend->mod = 0; depend->mod = 0;
@ -490,7 +490,7 @@ void splitdep(char *depstr, pmdepend_t *depend)
if(ptr == NULL) { if(ptr == NULL) {
FREE(str); FREE(str);
return; return(0);
} }
*ptr = '\0'; *ptr = '\0';
strncpy(depend->name, str, sizeof(depend->name)); strncpy(depend->name, str, sizeof(depend->name));
@ -501,7 +501,7 @@ void splitdep(char *depstr, pmdepend_t *depend)
strncpy(depend->version, ptr, sizeof(depend->version)); strncpy(depend->version, ptr, sizeof(depend->version));
FREE(str); FREE(str);
return; return(0);
} }
/* return a new PMList target list containing all packages in the original /* return a new PMList target list containing all packages in the original

2
lib/libalpm/deps.h
View file

@ -26,7 +26,7 @@
PMList *sortbydeps(PMList *targets, int mode); PMList *sortbydeps(PMList *targets, int mode);
PMList *checkdeps(pmdb_t *db, unsigned short op, PMList *packages); PMList *checkdeps(pmdb_t *db, unsigned short op, PMList *packages);
void splitdep(char *depstr, pmdepend_t *depend); int splitdep(char *depstr, pmdepend_t *depend);
PMList *removedeps(pmdb_t *db, PMList *targs); PMList *removedeps(pmdb_t *db, PMList *targs);
int resolvedeps(pmdb_t *local, PMList *databases, pmsync_t *sync, PMList *list, PMList *trail, PMList **data); int resolvedeps(pmdb_t *local, PMList *databases, pmsync_t *sync, PMList *list, PMList *trail, PMList **data);