aboutsummaryrefslogtreecommitdiff
path: root/archival/dpkg.c
diff options
context:
space:
mode:
authortimr <timr@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-01-25 00:08:53 +0000
committertimr <timr@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-01-25 00:08:53 +0000
commitfd8222f9b9db2a783b17ec9c59cf3fc22a4e4586 (patch)
tree5f329b7d0c7f20ecced0dc7581a9ba6dc720d965 /archival/dpkg.c
parent45d75f9ecc8f2b582407059da7d414f990ced68a (diff)
downloadbusybox-w32-fd8222f9b9db2a783b17ec9c59cf3fc22a4e4586.tar.gz
busybox-w32-fd8222f9b9db2a783b17ec9c59cf3fc22a4e4586.tar.bz2
busybox-w32-fd8222f9b9db2a783b17ec9c59cf3fc22a4e4586.zip
just whitespace
git-svn-id: svn://busybox.net/trunk/busybox@13584 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'archival/dpkg.c')
-rw-r--r--archival/dpkg.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 5f9f3a76b..7ed17d711 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -850,7 +850,7 @@ static void write_status_file(deb_file_t **deb_file)
850 } 850 }
851 851
852 tmp_string += 8; 852 tmp_string += 8;
853 tmp_string += strspn(tmp_string, " \n\t"); 853 tmp_string += strspn(tmp_string, " \n\t");
854 package_name = bb_xstrndup(tmp_string, strcspn(tmp_string, "\n\0")); 854 package_name = bb_xstrndup(tmp_string, strcspn(tmp_string, "\n\0"));
855 write_flag = FALSE; 855 write_flag = FALSE;
856 tmp_string = strstr(control_buffer, "Status:"); 856 tmp_string = strstr(control_buffer, "Status:");
@@ -989,8 +989,8 @@ static int package_satisfies_dependency(int package, int depend_type)
989 return 0; 989 return 0;
990 990
991 switch (depend_type) { 991 switch (depend_type) {
992 case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed"); 992 case EDGE_PRE_DEPENDS: return get_status(status_num, 3) == search_name_hashtable("installed");
993 case EDGE_DEPENDS: return get_status(status_num, 1) == search_name_hashtable("install"); 993 case EDGE_DEPENDS: return get_status(status_num, 1) == search_name_hashtable("install");
994 } 994 }
995 return 0; 995 return 0;
996} 996}
@@ -1078,7 +1078,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
1078 } 1078 }
1079 } 1079 }
1080 i++; 1080 i++;
1081 } 1081 }
1082 1082
1083 1083
1084 /* Check dependendcies */ 1084 /* Check dependendcies */
@@ -1114,8 +1114,8 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
1114 * things which are broken but unrelated to the 1114 * things which are broken but unrelated to the
1115 * packages that are currently being installed 1115 * packages that are currently being installed
1116 */ 1116 */
1117 if (state_status == search_name_hashtable("installed")) 1117 if (state_status == search_name_hashtable("installed"))
1118 continue; 1118 continue;
1119#endif 1119#endif
1120 1120
1121 /* This code is tested only for EDGE_DEPENDS, since I 1121 /* This code is tested only for EDGE_DEPENDS, since I
@@ -1125,13 +1125,13 @@ static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
1125 for (j = 0; j < package_node->num_of_edges; j++) { 1125 for (j = 0; j < package_node->num_of_edges; j++) {
1126 const edge_t *package_edge = package_node->edge[j]; 1126 const edge_t *package_edge = package_node->edge[j];
1127 unsigned int package_num; 1127 unsigned int package_num;
1128 1128
1129 if ( package_edge->type == EDGE_OR_PRE_DEPENDS || 1129 if ( package_edge->type == EDGE_OR_PRE_DEPENDS ||
1130 package_edge->type == EDGE_OR_DEPENDS ) { /* start an EDGE_OR_ list */ 1130 package_edge->type == EDGE_OR_DEPENDS ) { /* start an EDGE_OR_ list */
1131 number_of_alternatives = package_edge->version; 1131 number_of_alternatives = package_edge->version;
1132 root_of_alternatives = package_edge; 1132 root_of_alternatives = package_edge;
1133 continue; 1133 continue;
1134 } else if ( number_of_alternatives == 0 ) { /* not in the middle of an EDGE_OR_ list */ 1134 } else if ( number_of_alternatives == 0 ) { /* not in the middle of an EDGE_OR_ list */
1135 number_of_alternatives = 1; 1135 number_of_alternatives = 1;
1136 root_of_alternatives = NULL; 1136 root_of_alternatives = NULL;
1137 } 1137 }
@@ -1329,7 +1329,7 @@ static void free_array(char **array)
1329 */ 1329 */
1330static void list_packages(void) 1330static void list_packages(void)
1331{ 1331{
1332 int i; 1332 int i;
1333 1333
1334 printf(" Name Version\n"); 1334 printf(" Name Version\n");
1335 printf("+++-==============-==============\n"); 1335 printf("+++-==============-==============\n");
@@ -1715,7 +1715,7 @@ int dpkg_main(int argc, char **argv)
1715 1715
1716 if (package_num == -1) { 1716 if (package_num == -1) {
1717 bb_error_msg("Invalid control file in %s", argv[optind]); 1717 bb_error_msg("Invalid control file in %s", argv[optind]);
1718 optind++; 1718 optind++;
1719 continue; 1719 continue;
1720 } 1720 }
1721 deb_file[deb_count]->package = (unsigned int) package_num; 1721 deb_file[deb_count]->package = (unsigned int) package_num;