6a40be7 - Fix build on gcc — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

- Fix build on gcc

Brad Davis committed 12 years ago

commit 6a40be744db9a498dee16901f6beac9bd88f2d3a
parent b7ade8c

2 files changed +4 -4

modified libpkg/pkg_ports.c

@@ -698,7 +698,7 @@ parse_attributes(ucl_object_t *o, struct file_attr **a) {

 static int
 parse_and_apply_keyword_file(ucl_object_t *obj, struct plist *p, char *line, struct file_attr *attr)
 {
 	ucl_object_t *sub, *tmp, *actions;
 	ucl_object_t *sub, *tmp, *actions = NULL;
 	char *cmd;
 	const char *key;

modified libpkg/utils.c

@@ -481,7 +481,7 @@ yaml_sequence_to_object(ucl_object_t *obj, yaml_document_t *doc, yaml_node_t *no

 {
 	yaml_node_item_t *item;
 	yaml_node_t *val;
 	ucl_object_t *sub;
 	ucl_object_t *sub = NULL;
 	item = node->data.sequence.items.start;
 	while (item < node->data.sequence.items.top) {

@@ -514,7 +514,7 @@ yaml_mapping_to_object(ucl_object_t *obj, yaml_document_t *doc, yaml_node_t *nod

 	yaml_node_pair_t *pair;
 	yaml_node_t *key, *val;
 	ucl_object_t *sub;
 	ucl_object_t *sub = NULL;
 	pair = node->data.mapping.pairs.start;
 	while (pair < node->data.mapping.pairs.top) {

@@ -550,7 +550,7 @@ yaml_to_ucl(const char *file, const char *buffer, size_t len) {

 	yaml_document_t doc;
 	yaml_node_t *node;
 	ucl_object_t *obj = NULL;
 	FILE *fp;
 	FILE *fp = NULL;
 	memset(&parser, 0, sizeof(parser));