92e745d Remove yaml related code which is not used anywhere — HardenedBSD-pkg

HardenedBSD Package Manager

Remove yaml related code which is not used anywhere

Baptiste Daroussin committed 11 years ago

commit 92e745d77512037cbf59140341ce2fa45927d6e3
parent f5a67be3e924822f7fceb2e296945ac7010a9684

3 files changed +0 -136

modified libpkg/private/pkg.h

@@ -115,16 +115,6 @@

 #define HASH_ADD_UCLT(head,type,add)                             \
 	HASH_ADD(hh, head, type, sizeof(uint16_t), add)
 #define HASH_FIND_YAMLT(head,type,out)                                   \
 	HASH_FIND(hh,head,type,sizeof(yaml_node_type_t),out)
 #define HASH_ADD_YAMLT(head,type,add)                                    \
 	HASH_ADD(hh,head,type,sizeof(yaml_node_type_t),add)
 #define HASH_FIND_YAMLEVT(head,type,out)                                   \
 	HASH_FIND(hh,head,type,sizeof(yaml_event_type_t),out)
 #define HASH_ADD_YAMLEVT(head,type,add)                                    \
 	HASH_ADD(hh,head,type,sizeof(yaml_event_type_t),add)
 extern int eventpipe;
 struct pkg_repo_it;

modified libpkg/private/utils.h

@@ -117,7 +117,6 @@ struct dns_srvinfo *

 	dns_getsrvinfo(const char *zone);
 int set_nameserver(const char *nsname);
 ucl_object_t *yaml_to_ucl(const char *file, const char *buffer, size_t len);
 void set_blocking(int fd);
 void set_nonblocking(int fd);
 void print_trace(void);

modified libpkg/utils.c

@@ -582,131 +582,6 @@ is_valid_abi(const char *arch, bool emit_error) {

 	return (true);
 }
 static ucl_object_t *yaml_mapping_to_object(ucl_object_t *obj, yaml_document_t *doc, yaml_node_t *node);
 static ucl_object_t *
 yaml_sequence_to_object(ucl_object_t *obj, yaml_document_t *doc, yaml_node_t *node)
 {
 	yaml_node_item_t *item;
 	yaml_node_t *val;
 	ucl_object_t *sub = NULL;
 	item = node->data.sequence.items.start;
 	while (item < node->data.sequence.items.top) {
 		val = yaml_document_get_node(doc, *item);
 		switch (val->type) {
 		case YAML_MAPPING_NODE:
 			sub = yaml_mapping_to_object(NULL, doc, val);
 			break;
 		case YAML_SEQUENCE_NODE:
 			sub = yaml_sequence_to_object(NULL, doc, val);
 			break;
 		case YAML_SCALAR_NODE:
 			sub = ucl_object_fromstring_common (val->data.scalar.value,
 			    val->data.scalar.length, UCL_STRING_TRIM|UCL_STRING_PARSE_BOOLEAN|UCL_STRING_PARSE_INT);
 			break;
 		case YAML_NO_NODE:
 			/* Should not happen */
 			break;
 		}
 		if (obj == NULL)
 			obj = ucl_object_typed_new(UCL_ARRAY);
 		ucl_array_append(obj, sub);
 		++item;
 	}
 	return (obj);
 }
 static ucl_object_t *
 yaml_mapping_to_object(ucl_object_t *obj, yaml_document_t *doc, yaml_node_t *node)
 {
 	yaml_node_pair_t *pair;
 	yaml_node_t *key, *val;
 	ucl_object_t *sub = NULL;
 	pair = node->data.mapping.pairs.start;
 	while (pair < node->data.mapping.pairs.top) {
 		key = yaml_document_get_node(doc, pair->key);
 		val = yaml_document_get_node(doc, pair->value);
 		switch (val->type) {
 		case YAML_MAPPING_NODE:
 			sub = yaml_mapping_to_object(NULL, doc, val);
 			break;
 		case YAML_SEQUENCE_NODE:
 			sub = yaml_sequence_to_object(NULL, doc, val);
 			break;
 		case YAML_SCALAR_NODE:
 			sub = ucl_object_fromstring_common (val->data.scalar.value,
 			    val->data.scalar.length,
 			    UCL_STRING_TRIM|UCL_STRING_PARSE_BOOLEAN|UCL_STRING_PARSE_INT);
 			break;
 		case YAML_NO_NODE:
 			/* Should not happen */
 			break;
 		}
 		if (sub != NULL) {
 			if (obj == NULL)
 				obj = ucl_object_typed_new(UCL_OBJECT);
 			ucl_object_insert_key(obj, sub, key->data.scalar.value, key->data.scalar.length, true);
 		}
 		++pair;
 	}
 	return (obj);
 }
 ucl_object_t *
 yaml_to_ucl(const char *file, const char *buffer, size_t len) {
 	yaml_parser_t parser;
 	yaml_document_t doc;
 	yaml_node_t *node;
 	ucl_object_t *obj = NULL;
 	FILE *fp = NULL;
 	memset(&parser, 0, sizeof(parser));
 	yaml_parser_initialize(&parser);
 	if (file != NULL) {
 		fp = fopen(file, "r");
 		if (fp == NULL) {
 			pkg_emit_errno("fopen", file);
 			return (NULL);
 		}
 		yaml_parser_set_input_file(&parser, fp);
 	} else {
 		yaml_parser_set_input_string(&parser, buffer, len);
 	}
 	yaml_parser_load(&parser, &doc);
 	node = yaml_document_get_root_node(&doc);
 	if (node != NULL) {
 		switch (node->type) {
 		case YAML_MAPPING_NODE:
 			obj = yaml_mapping_to_object(NULL, &doc, node);
 			break;
 		case YAML_SEQUENCE_NODE:
 			obj = yaml_sequence_to_object(NULL, &doc, node);
 			break;
 		case YAML_SCALAR_NODE:
 		case YAML_NO_NODE:
 			break;
 		}
 	}
 	yaml_document_delete(&doc);
 	yaml_parser_delete(&parser);
 	if (file != NULL)
 		fclose(fp);
 	return (obj);
 }
 void
 set_nonblocking(int fd)
 {