summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-04-01 13:07:24 +0000
committerJason Woodward2005-04-01 13:07:24 +0000
commit1a4470aeca3b1a1614f78b69e18b5761abde88cf (patch)
tree18320c955f02541f299e534dece6e990c04fe9c4
parent1a805a25b9a18fd9fe4a4c86fafd2374f7e37978 (diff)
downloadslapt-get-1a4470aeca3b1a1614f78b69e18b5761abde88cf.tar.gz
formatting update
-rw-r--r--src/package.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/package.c b/src/package.c
index dda4bc3..9c85efe 100644
--- a/src/package.c
+++ b/src/package.c
@@ -264,8 +264,8 @@ struct pkg_list *parse_packages_txt(FILE *pkg_list_fh){
);
if( tmp_realloc != NULL ){
tmp_pkg->required = tmp_realloc;
- strncpy(tmp_pkg->required,char_pointer + req_len, strlen(char_pointer + req_len));
- tmp_pkg->required[ strlen(char_pointer + req_len) ] = '\0';
+ strncpy(tmp_pkg->required,char_pointer + req_len, strlen(char_pointer + req_len));
+ tmp_pkg->required[ strlen(char_pointer + req_len) ] = '\0';
}
}else{
/* required isn't provided... rewind one line */
@@ -284,7 +284,7 @@ struct pkg_list *parse_packages_txt(FILE *pkg_list_fh){
tmp_realloc = realloc(tmp_pkg->conflicts, sizeof *tmp_pkg->conflicts * (strlen(conflicts) + 1));
if( tmp_realloc != NULL ){
tmp_pkg->conflicts = tmp_realloc;
- strncat(tmp_pkg->conflicts,conflicts,strlen(conflicts));
+ strncat(tmp_pkg->conflicts,conflicts,strlen(conflicts));
tmp_pkg->conflicts[ strlen(conflicts) ] = '\0';
}
}else{
@@ -1100,6 +1100,7 @@ int get_pkg_dependencies(const rc_config *global_config,struct pkg_list *avail_p
}
position += strlen(pointer);
+
}else{
/* if we have a comma, skip it */