Remove xmalloc calls.

author: Matt Kraai <kraai@debian.org> 2001-10-18 15:08:30 +0000
committer: Matt Kraai <kraai@debian.org> 2001-10-18 15:08:30 +0000
commit: 3dd4f5ed69cb6cfc603cae9c79b93eca89d888cc (patch)
tree: 0d3bef69e4ca2c2992396d073c02b5ed0a51ef45
parent: a0f0ae5a7acd71c3c56df5183e38c189c3151c98 (diff)
download: busybox-w32-3dd4f5ed69cb6cfc603cae9c79b93eca89d888cc.tar.gz
busybox-w32-3dd4f5ed69cb6cfc603cae9c79b93eca89d888cc.tar.bz2
busybox-w32-3dd4f5ed69cb6cfc603cae9c79b93eca89d888cc.zip
2 files changed, 58 insertions, 60 deletions
diff --git a/archival/dpkg.c b/archival/dpkg.c
index a00697207..95c8b88cb 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -506,60 +506,59 @@ unsigned int fill_package_struct(char *control_buffer)
 {
        common_node_t *new_node = (common_node_t *) xcalloc(1, sizeof(common_node_t));
-        char **field_name = xmalloc(sizeof(char *));
+        char *field_name;
-        char **field_value = xmalloc(sizeof(char *));
+        char *field_value;
        int field_start = 0;
        int num = -1;
        int buffer_length = strlen(control_buffer);
        new_node->version = search_name_hashtable("unknown");
        while (field_start < buffer_length) {
-                field_start += read_package_field(&control_buffer[field_start], field_name, field_value);
+                field_start += read_package_field(&control_buffer[field_start],
+                                &field_name, &field_value);
-                if (*field_name == NULL) {
+                if (field_name == NULL) {
                        goto fill_package_struct_cleanup; // Oh no, the dreaded goto statement !!
                }
-                if (strcmp(*field_name, "Package") == 0) {
+                if (strcmp(field_name, "Package") == 0) {
-                        new_node->name = search_name_hashtable(*field_value);
+                        new_node->name = search_name_hashtable(field_value);
                }
-                else if (strcmp(*field_name, "Version") == 0) {
+                else if (strcmp(field_name, "Version") == 0) {
-                        new_node->version = search_name_hashtable(*field_value);
+                        new_node->version = search_name_hashtable(field_value);
                }
-                else if (strcmp(*field_name, "Pre-Depends") == 0) {
+                else if (strcmp(field_name, "Pre-Depends") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_PRE_DEPENDS);
+                        add_split_dependencies(new_node, field_value, EDGE_PRE_DEPENDS);
                }
-                else if (strcmp(*field_name, "Depends") == 0) {
+                else if (strcmp(field_name, "Depends") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_DEPENDS);
+                        add_split_dependencies(new_node, field_value, EDGE_DEPENDS);
                }
-                else if (strcmp(*field_name, "Replaces") == 0) {
+                else if (strcmp(field_name, "Replaces") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_REPLACES);
+                        add_split_dependencies(new_node, field_value, EDGE_REPLACES);
                }
-                else if (strcmp(*field_name, "Provides") == 0) {
+                else if (strcmp(field_name, "Provides") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_PROVIDES);
+                        add_split_dependencies(new_node, field_value, EDGE_PROVIDES);
                }
-                else if (strcmp(*field_name, "Conflicts") == 0) {
+                else if (strcmp(field_name, "Conflicts") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_CONFLICTS);
+                        add_split_dependencies(new_node, field_value, EDGE_CONFLICTS);
                }
-                else if (strcmp(*field_name, "Suggests") == 0) {
+                else if (strcmp(field_name, "Suggests") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_SUGGESTS);
+                        add_split_dependencies(new_node, field_value, EDGE_SUGGESTS);
                }
-                else if (strcmp(*field_name, "Recommends") == 0) {
+                else if (strcmp(field_name, "Recommends") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_RECOMMENDS);
+                        add_split_dependencies(new_node, field_value, EDGE_RECOMMENDS);
                }
-                else if (strcmp(*field_name, "Enhances") == 0) {
+                else if (strcmp(field_name, "Enhances") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_ENHANCES);
+                        add_split_dependencies(new_node, field_value, EDGE_ENHANCES);
                }
 fill_package_struct_cleanup:
-                if (*field_name) {
+                if (field_name) {
-                        free(*field_name);
+                        free(field_name);
                }
-                if (*field_value) {
+                if (field_value) {
-                        free(*field_value);
+                        free(field_value);
                }
        }
-        free(field_name);
-        free(field_value);
        if (new_node->version == search_name_hashtable("unknown")) {
                free_package(new_node);
diff --git a/dpkg.c b/dpkg.c
index a00697207..95c8b88cb 100644
--- a/dpkg.c
+++ b/dpkg.c
@@ -506,60 +506,59 @@ unsigned int fill_package_struct(char *control_buffer)
 {
        common_node_t *new_node = (common_node_t *) xcalloc(1, sizeof(common_node_t));
-        char **field_name = xmalloc(sizeof(char *));
+        char *field_name;
-        char **field_value = xmalloc(sizeof(char *));
+        char *field_value;
        int field_start = 0;
        int num = -1;
        int buffer_length = strlen(control_buffer);
        new_node->version = search_name_hashtable("unknown");
        while (field_start < buffer_length) {
-                field_start += read_package_field(&control_buffer[field_start], field_name, field_value);
+                field_start += read_package_field(&control_buffer[field_start],
+                                &field_name, &field_value);
-                if (*field_name == NULL) {
+                if (field_name == NULL) {
                        goto fill_package_struct_cleanup; // Oh no, the dreaded goto statement !!
                }
-                if (strcmp(*field_name, "Package") == 0) {
+                if (strcmp(field_name, "Package") == 0) {
-                        new_node->name = search_name_hashtable(*field_value);
+                        new_node->name = search_name_hashtable(field_value);
                }
-                else if (strcmp(*field_name, "Version") == 0) {
+                else if (strcmp(field_name, "Version") == 0) {
-                        new_node->version = search_name_hashtable(*field_value);
+                        new_node->version = search_name_hashtable(field_value);
                }
-                else if (strcmp(*field_name, "Pre-Depends") == 0) {
+                else if (strcmp(field_name, "Pre-Depends") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_PRE_DEPENDS);
+                        add_split_dependencies(new_node, field_value, EDGE_PRE_DEPENDS);
                }
-                else if (strcmp(*field_name, "Depends") == 0) {
+                else if (strcmp(field_name, "Depends") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_DEPENDS);
+                        add_split_dependencies(new_node, field_value, EDGE_DEPENDS);
                }
-                else if (strcmp(*field_name, "Replaces") == 0) {
+                else if (strcmp(field_name, "Replaces") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_REPLACES);
+                        add_split_dependencies(new_node, field_value, EDGE_REPLACES);
                }
-                else if (strcmp(*field_name, "Provides") == 0) {
+                else if (strcmp(field_name, "Provides") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_PROVIDES);
+                        add_split_dependencies(new_node, field_value, EDGE_PROVIDES);
                }
-                else if (strcmp(*field_name, "Conflicts") == 0) {
+                else if (strcmp(field_name, "Conflicts") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_CONFLICTS);
+                        add_split_dependencies(new_node, field_value, EDGE_CONFLICTS);
                }
-                else if (strcmp(*field_name, "Suggests") == 0) {
+                else if (strcmp(field_name, "Suggests") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_SUGGESTS);
+                        add_split_dependencies(new_node, field_value, EDGE_SUGGESTS);
                }
-                else if (strcmp(*field_name, "Recommends") == 0) {
+                else if (strcmp(field_name, "Recommends") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_RECOMMENDS);
+                        add_split_dependencies(new_node, field_value, EDGE_RECOMMENDS);
                }
-                else if (strcmp(*field_name, "Enhances") == 0) {
+                else if (strcmp(field_name, "Enhances") == 0) {
-                        add_split_dependencies(new_node, *field_value, EDGE_ENHANCES);
+                        add_split_dependencies(new_node, field_value, EDGE_ENHANCES);
                }
 fill_package_struct_cleanup:
-                if (*field_name) {
+                if (field_name) {
-                        free(*field_name);
+                        free(field_name);
                }
-                if (*field_value) {
+                if (field_value) {
-                        free(*field_value);
+                        free(field_value);
                }
        }
-        free(field_name);
-        free(field_value);
        if (new_node->version == search_name_hashtable("unknown")) {
                free_package(new_node);
author	Matt Kraai <kraai@debian.org>	2001-10-18 15:08:30 +0000
committer	Matt Kraai <kraai@debian.org>	2001-10-18 15:08:30 +0000
commit	3dd4f5ed69cb6cfc603cae9c79b93eca89d888cc (patch)
tree	0d3bef69e4ca2c2992396d073c02b5ed0a51ef45
parent	a0f0ae5a7acd71c3c56df5183e38c189c3151c98 (diff)
download	busybox-w32-3dd4f5ed69cb6cfc603cae9c79b93eca89d888cc.tar.gz busybox-w32-3dd4f5ed69cb6cfc603cae9c79b93eca89d888cc.tar.bz2 busybox-w32-3dd4f5ed69cb6cfc603cae9c79b93eca89d888cc.zip

diff --git a/archival/dpkg.c b/archival/dpkg.c index a00697207..95c8b88cb 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c
@@ -506,60 +506,59 @@ unsigned int fill_package_struct(char *control_buffer)
506	{	506	{
507	common_node_t new_node = (common_node_t ) xcalloc(1, sizeof(common_node_t));	507	common_node_t new_node = (common_node_t ) xcalloc(1, sizeof(common_node_t));
508		508
509	char *field_name = xmalloc(sizeof(char ));	509	char *field_name;
510	char *field_value = xmalloc(sizeof(char ));	510	char *field_value;
511	int field_start = 0;	511	int field_start = 0;
512	int num = -1;	512	int num = -1;
513	int buffer_length = strlen(control_buffer);	513	int buffer_length = strlen(control_buffer);
514		514
515	new_node->version = search_name_hashtable("unknown");	515	new_node->version = search_name_hashtable("unknown");
516	while (field_start < buffer_length) {	516	while (field_start < buffer_length) {
517	field_start += read_package_field(&control_buffer[field_start], field_name, field_value);	517	field_start += read_package_field(&control_buffer[field_start],
		518	&field_name, &field_value);
518		519
519	if (*field_name == NULL) {	520	if (field_name == NULL) {
520	goto fill_package_struct_cleanup; // Oh no, the dreaded goto statement !!	521	goto fill_package_struct_cleanup; // Oh no, the dreaded goto statement !!
521	}	522	}
522		523
523	if (strcmp(*field_name, "Package") == 0) {	524	if (strcmp(field_name, "Package") == 0) {
524	new_node->name = search_name_hashtable(*field_value);	525	new_node->name = search_name_hashtable(field_value);
525	}	526	}
526	else if (strcmp(*field_name, "Version") == 0) {	527	else if (strcmp(field_name, "Version") == 0) {
527	new_node->version = search_name_hashtable(*field_value);	528	new_node->version = search_name_hashtable(field_value);
528	}	529	}
529	else if (strcmp(*field_name, "Pre-Depends") == 0) {	530	else if (strcmp(field_name, "Pre-Depends") == 0) {
530	add_split_dependencies(new_node, *field_value, EDGE_PRE_DEPENDS);	531	add_split_dependencies(new_node, field_value, EDGE_PRE_DEPENDS);
531	}	532	}
532	else if (strcmp(*field_name, "Depends") == 0) {	533	else if (strcmp(field_name, "Depends") == 0) {
533	add_split_dependencies(new_node, *field_value, EDGE_DEPENDS);	534	add_split_dependencies(new_node, field_value, EDGE_DEPENDS);
534	}	535	}
535	else if (strcmp(*field_name, "Replaces") == 0) {	536	else if (strcmp(field_name, "Replaces") == 0) {
536	add_split_dependencies(new_node, *field_value, EDGE_REPLACES);	537	add_split_dependencies(new_node, field_value, EDGE_REPLACES);
537	}	538	}
538	else if (strcmp(*field_name, "Provides") == 0) {	539	else if (strcmp(field_name, "Provides") == 0) {
539	add_split_dependencies(new_node, *field_value, EDGE_PROVIDES);	540	add_split_dependencies(new_node, field_value, EDGE_PROVIDES);
540	}	541	}
541	else if (strcmp(*field_name, "Conflicts") == 0) {	542	else if (strcmp(field_name, "Conflicts") == 0) {
542	add_split_dependencies(new_node, *field_value, EDGE_CONFLICTS);	543	add_split_dependencies(new_node, field_value, EDGE_CONFLICTS);
543	}	544	}
544	else if (strcmp(*field_name, "Suggests") == 0) {	545	else if (strcmp(field_name, "Suggests") == 0) {
545	add_split_dependencies(new_node, *field_value, EDGE_SUGGESTS);	546	add_split_dependencies(new_node, field_value, EDGE_SUGGESTS);
546	}	547	}
547	else if (strcmp(*field_name, "Recommends") == 0) {	548	else if (strcmp(field_name, "Recommends") == 0) {
548	add_split_dependencies(new_node, *field_value, EDGE_RECOMMENDS);	549	add_split_dependencies(new_node, field_value, EDGE_RECOMMENDS);
549	}	550	}
550	else if (strcmp(*field_name, "Enhances") == 0) {	551	else if (strcmp(field_name, "Enhances") == 0) {
551	add_split_dependencies(new_node, *field_value, EDGE_ENHANCES);	552	add_split_dependencies(new_node, field_value, EDGE_ENHANCES);
552	}	553	}
553	fill_package_struct_cleanup:	554	fill_package_struct_cleanup:
554	if (*field_name) {	555	if (field_name) {
555	free(*field_name);	556	free(field_name);
556	}	557	}
557	if (*field_value) {	558	if (field_value) {
558	free(*field_value);	559	free(field_value);
559	}	560	}
560	}	561	}
561	free(field_name);
562	free(field_value);
563		562
564	if (new_node->version == search_name_hashtable("unknown")) {	563	if (new_node->version == search_name_hashtable("unknown")) {
565	free_package(new_node);	564	free_package(new_node);


diff --git a/dpkg.c b/dpkg.c index a00697207..95c8b88cb 100644 --- a/dpkg.c +++ b/dpkg.c
@@ -506,60 +506,59 @@ unsigned int fill_package_struct(char *control_buffer)
506	{	506	{
507	common_node_t new_node = (common_node_t ) xcalloc(1, sizeof(common_node_t));	507	common_node_t new_node = (common_node_t ) xcalloc(1, sizeof(common_node_t));
508		508
509	char *field_name = xmalloc(sizeof(char ));	509	char *field_name;
510	char *field_value = xmalloc(sizeof(char ));	510	char *field_value;
511	int field_start = 0;	511	int field_start = 0;
512	int num = -1;	512	int num = -1;
513	int buffer_length = strlen(control_buffer);	513	int buffer_length = strlen(control_buffer);
514		514
515	new_node->version = search_name_hashtable("unknown");	515	new_node->version = search_name_hashtable("unknown");
516	while (field_start < buffer_length) {	516	while (field_start < buffer_length) {
517	field_start += read_package_field(&control_buffer[field_start], field_name, field_value);	517	field_start += read_package_field(&control_buffer[field_start],
		518	&field_name, &field_value);
518		519
519	if (*field_name == NULL) {	520	if (field_name == NULL) {
520	goto fill_package_struct_cleanup; // Oh no, the dreaded goto statement !!	521	goto fill_package_struct_cleanup; // Oh no, the dreaded goto statement !!
521	}	522	}
522		523
523	if (strcmp(*field_name, "Package") == 0) {	524	if (strcmp(field_name, "Package") == 0) {
524	new_node->name = search_name_hashtable(*field_value);	525	new_node->name = search_name_hashtable(field_value);
525	}	526	}
526	else if (strcmp(*field_name, "Version") == 0) {	527	else if (strcmp(field_name, "Version") == 0) {
527	new_node->version = search_name_hashtable(*field_value);	528	new_node->version = search_name_hashtable(field_value);
528	}	529	}
529	else if (strcmp(*field_name, "Pre-Depends") == 0) {	530	else if (strcmp(field_name, "Pre-Depends") == 0) {
530	add_split_dependencies(new_node, *field_value, EDGE_PRE_DEPENDS);	531	add_split_dependencies(new_node, field_value, EDGE_PRE_DEPENDS);
531	}	532	}
532	else if (strcmp(*field_name, "Depends") == 0) {	533	else if (strcmp(field_name, "Depends") == 0) {
533	add_split_dependencies(new_node, *field_value, EDGE_DEPENDS);	534	add_split_dependencies(new_node, field_value, EDGE_DEPENDS);
534	}	535	}
535	else if (strcmp(*field_name, "Replaces") == 0) {	536	else if (strcmp(field_name, "Replaces") == 0) {
536	add_split_dependencies(new_node, *field_value, EDGE_REPLACES);	537	add_split_dependencies(new_node, field_value, EDGE_REPLACES);
537	}	538	}
538	else if (strcmp(*field_name, "Provides") == 0) {	539	else if (strcmp(field_name, "Provides") == 0) {
539	add_split_dependencies(new_node, *field_value, EDGE_PROVIDES);	540	add_split_dependencies(new_node, field_value, EDGE_PROVIDES);
540	}	541	}
541	else if (strcmp(*field_name, "Conflicts") == 0) {	542	else if (strcmp(field_name, "Conflicts") == 0) {
542	add_split_dependencies(new_node, *field_value, EDGE_CONFLICTS);	543	add_split_dependencies(new_node, field_value, EDGE_CONFLICTS);
543	}	544	}
544	else if (strcmp(*field_name, "Suggests") == 0) {	545	else if (strcmp(field_name, "Suggests") == 0) {
545	add_split_dependencies(new_node, *field_value, EDGE_SUGGESTS);	546	add_split_dependencies(new_node, field_value, EDGE_SUGGESTS);
546	}	547	}
547	else if (strcmp(*field_name, "Recommends") == 0) {	548	else if (strcmp(field_name, "Recommends") == 0) {
548	add_split_dependencies(new_node, *field_value, EDGE_RECOMMENDS);	549	add_split_dependencies(new_node, field_value, EDGE_RECOMMENDS);
549	}	550	}
550	else if (strcmp(*field_name, "Enhances") == 0) {	551	else if (strcmp(field_name, "Enhances") == 0) {
551	add_split_dependencies(new_node, *field_value, EDGE_ENHANCES);	552	add_split_dependencies(new_node, field_value, EDGE_ENHANCES);
552	}	553	}
553	fill_package_struct_cleanup:	554	fill_package_struct_cleanup:
554	if (*field_name) {	555	if (field_name) {
555	free(*field_name);	556	free(field_name);
556	}	557	}
557	if (*field_value) {	558	if (field_value) {
558	free(*field_value);	559	free(field_value);
559	}	560	}
560	}	561	}
561	free(field_name);
562	free(field_value);
563		562
564	if (new_node->version == search_name_hashtable("unknown")) {	563	if (new_node->version == search_name_hashtable("unknown")) {
565	free_package(new_node);	564	free_package(new_node);