Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 8c63c46
Fix build with clang 3.2
Dimitry Andric committed 13 years ago
commit 8c63c46003f5227899241609f356c714d3f32a8b
parent f40bb9d
2 files changed +4 -3
modified libpkg/pkg.h
@@ -235,7 +235,8 @@ typedef enum {
	PKG_SCRIPT_POST_UPGRADE,

	PKG_SCRIPT_INSTALL,

	PKG_SCRIPT_DEINSTALL,
- 
	PKG_SCRIPT_UPGRADE
+ 
	PKG_SCRIPT_UPGRADE,
+ 
	PKG_SCRIPT_UNKNOWN

} pkg_script;



typedef enum _pkg_jobs_t {
modified libpkg/pkg_manifest.c
@@ -314,7 +314,7 @@ script_type_str(const char *str)
		return (PKG_SCRIPT_DEINSTALL);

	if (strcmp(str, "post-deinstall") == 0)

		return (PKG_SCRIPT_POST_DEINSTALL);
- 
	return (INT_MAX);
+ 
	return (PKG_SCRIPT_UNKNOWN);

}



static int
@@ -413,7 +413,7 @@ parse_mapping(struct pkg *pkg, yaml_node_t *item, yaml_document_t *doc, int attr
				pkg_emit_error("Skipping malformed scripts %s",

				    key->data.scalar.value);

			script_type = script_type_str(key->data.scalar.value);
- 
			if (script_type == INT_MAX) {
+ 
			if (script_type == PKG_SCRIPT_UNKNOWN) {

				pkg_emit_error("Skipping unknown script "

				    "type: %s", key->data.scalar.value);

				break;