Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 4c4f5c9
Convert try (from dirrm) from int to bool
Baptiste Daroussin committed 14 years ago
commit 4c4f5c9730c140935c5ebcf2cc3dfaee989760a1
parent 445b9df
5 files changed +14 -12
modified libpkg/pkg.c
@@ -614,12 +614,12 @@ pkg_addcategory(struct pkg *pkg, const char *name)
}



int
- 
pkg_adddir(struct pkg *pkg, const char *path, int try)
+ 
pkg_adddir(struct pkg *pkg, const char *path, bool try)

{

	return(pkg_adddir_attr(pkg, path, NULL, NULL, 0, try));

}

int
- 
pkg_adddir_attr(struct pkg *pkg, const char *path, const char *uname, const char *gname, mode_t perm, int try)
+ 
pkg_adddir_attr(struct pkg *pkg, const char *path, const char *uname, const char *gname, mode_t perm, bool try)

{

	struct pkg_dir *d = NULL;
modified libpkg/pkg.h
@@ -409,7 +409,7 @@ int pkg_addfile_attr(struct pkg *pkg, const char *path, const char *sha256, cons
 * Add a path

 * @return An error code.

 */
- 
int pkg_adddir(struct pkg *pkg, const char *path, int try);
+ 
int pkg_adddir(struct pkg *pkg, const char *path, bool try);



/**

 * Allocate a new struct pkg_file and add it to the files of pkg;
@@ -419,7 +419,7 @@ int pkg_adddir(struct pkg *pkg, const char *path, int try);
 * @param perm the permission

 * @return An error code.

 */
- 
int pkg_adddir_attr(struct pkg *pkg, const char *path, const char *uname, const char *gname, mode_t perm, int try);
+ 
int pkg_adddir_attr(struct pkg *pkg, const char *path, const char *uname, const char *gname, mode_t perm, bool try);



/**

 * Add a category
@@ -500,7 +500,7 @@ const char *pkg_dep_get(struct pkg_dep const * const , const pkg_dep_attr);
const char *pkg_file_get(struct pkg_file const * const, const pkg_file_attr);



const char *pkg_dir_path(struct pkg_dir *);
- 
int pkg_dir_try(struct pkg_dir *);
+ 
bool pkg_dir_try(struct pkg_dir *);



const char *pkg_category_name(struct pkg_category *);
modified libpkg/pkg_attributes.c
@@ -105,7 +105,7 @@ pkg_dir_new(struct pkg_dir **d)


	(*d)->perm = 0;

	(*d)->keep = 0;
- 
	(*d)->try = 0;
+ 
	(*d)->try = false;



	return (EPKG_OK);

}
@@ -122,7 +122,7 @@ pkg_dir_path(struct pkg_dir *d)
	return (d->path);

}
- 
int
+ 
bool

pkg_dir_try(struct pkg_dir *d)

{

	return (d->try);
modified libpkg/pkg_manifest.c
@@ -434,7 +434,7 @@ pkg_set_dirs_from_node(struct pkg *pkg, yaml_node_t *item, yaml_document_t *doc,
	const char *gname = NULL;

	void *set;

	mode_t perm = 0;
- 
	int try = 1;
+ 
	bool try = false;



	pair = item->data.mapping.pairs.start;

	while (pair < item->data.mapping.pairs.top) {
@@ -462,10 +462,12 @@ pkg_set_dirs_from_node(struct pkg *pkg, yaml_node_t *item, yaml_document_t *doc,
			else

				perm = getmode(set, 0);

		} else if (!strcasecmp(key->data.scalar.value, "try")) {
- 
			if (val->data.scalar.value[0] == 'n' || val->data.scalar.value[0] == 'y')
- 
				try = val->data.scalar.value[0];
+ 
			if (val->data.scalar.value[0] == 'n')
+ 
				try = false;
+ 
			else if (val->data.scalar.value[0] == 'y')
+ 
				try = true;

			else
- 
				pkg_emit_error("Wrong value for try: %s, expected 'y' or 'n'");
+ 
				pkg_emit_error("Wrong value for try: %s, expected 'y' or 'n'", val->data.scalar.value);

		} else {

			pkg_emit_error("Skipping unknown key for dir(%s): %s", dirname,

						   key->data.scalar.value);
modified libpkg/private/pkg.h
@@ -83,7 +83,7 @@ struct pkg_dir {
	char gname[MAXLOGNAME +1];

	mode_t perm;

	int keep;
- 
	int try;
+ 
	bool try;

	STAILQ_ENTRY(pkg_dir) next;

};