Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 38d00a4
Finish using the pkg_*_get for dep, files, dir
Baptiste Daroussin committed 13 years ago
commit 38d00a4db998debc92ba90cd8e1ea69771182aaa
parent c7a4289
2 files changed +29 -95
modified libpkg/pkg.h.in
@@ -246,6 +246,12 @@ typedef enum {
} pkg_file_attr;



typedef enum {
+ 
	PKG_DIR_PATH = 0,
+ 
	PKG_DIR_UNAME,
+ 
	PKG_DIR_GNAME
+ 
} pkg_dir_attr;
+
+ 
typedef enum {

	PKG_DEPS = 0,

	PKG_RDEPS,

	PKG_LICENSES,
@@ -739,27 +745,26 @@ int pkg_emit_manifest(struct pkg *pkg, char **buf);


/* pkg_dep */

const char *pkg_dep_get(struct pkg_dep const * const , const pkg_dep_attr);
-
- 
const char *pkg_dep_name(struct pkg_dep const * const);
- 
const char *pkg_dep_origin(struct pkg_dep const * const);
- 
const char *pkg_dep_version(struct pkg_dep const * const);
+ 
#define pkg_dep_name(d) pkg_dep_get(d, PKG_DEP_NAME)
+ 
#define pkg_dep_origin(d) pkg_dep_get(d, PKG_DEP_ORIGIN)
+ 
#define pkg_dep_version(d) pkg_dep_get(d, PKG_DEP_VERSION)

bool pkg_dep_is_locked(struct pkg_dep const * const);



/* pkg_file */

const char *pkg_file_get(struct pkg_file const * const, const pkg_file_attr);
-
- 
const char *pkg_file_path(struct pkg_file const * const);
- 
const char *pkg_file_cksum(struct pkg_file const * const);
- 
const char *pkg_file_uname(struct pkg_file const * const);
- 
const char *pkg_file_gname(struct pkg_file const * const);
+ 
#define pkg_file_path(f) pkg_file_get(f, PKG_FILE_PATH)
+ 
#define pkg_file_cksum(f) pkg_file_get(f, PKG_FILE_SUM)
+ 
#define pkg_file_uname(f) pkg_file_get(f, PKG_FILE_UNAME)
+ 
#define pkg_file_gname(f) pkg_file_get(f, PKG_FILE_GNAME)

mode_t pkg_file_mode(struct pkg_file const * const);



bool pkg_has_dir(struct pkg *, const char *);

bool pkg_has_file(struct pkg *, const char *);

/* pkg_dir */
- 
const char *pkg_dir_path(struct pkg_dir const * const);
- 
const char *pkg_dir_uname(struct pkg_dir const * const);
- 
const char *pkg_dir_gname(struct pkg_dir const * const);
+ 
const char *pkg_dir_get(struct pkg_dir const * const, const pkg_dir_attr);
+ 
#define pkg_dir_path(d) pkg_dir_get(d, PKG_DIR_PATH)
+ 
#define pkg_dir_uname(d) pkg_dir_get(d, PKG_DIR_UNAME)
+ 
#define pkg_dir_gname(d) pkg_dir_get(d, PKG_DIR_GNAME)

mode_t pkg_dir_mode(struct pkg_dir const * const);

bool pkg_dir_try(struct pkg_dir const * const);
modified libpkg/pkg_attributes.c
@@ -77,38 +77,6 @@ pkg_dep_get(struct pkg_dep const * const d, const pkg_dep_attr attr)
	}

}
- 
const char *
- 
pkg_dep_name(struct pkg_dep const * const d)
- 
{
- 
	assert( d != NULL);
-
- 
	return (sbuf_get(d->name));
- 
}
-
- 
const char *
- 
pkg_dep_origin(struct pkg_dep const * const d)
- 
{
- 
	assert( d != NULL);
-
- 
	return (sbuf_get(d->origin));
- 
}
-
- 
const char *
- 
pkg_dep_version(struct pkg_dep const * const d)
- 
{
- 
	assert( d != NULL);
-
- 
	return (sbuf_get(d->version));
- 
}
-
- 
bool
- 
pkg_dep_is_locked(struct pkg_dep const * const d)
- 
{
- 
	assert(d != NULL);
-
- 
	return d->locked;
- 
}
- 


/*

 * File

 */
@@ -155,38 +123,6 @@ pkg_file_get(struct pkg_file const * const f, const pkg_file_attr attr)
	}

}
- 
const char *
- 
pkg_file_path(struct pkg_file const * const f)
- 
{
- 
	assert(f != NULL);
-
- 
	return (f->path);
- 
}
-
- 
const char *
- 
pkg_file_cksum(struct pkg_file const * const f)
- 
{
- 
	assert(f != NULL);
-
- 
	return (f->sum);
- 
}
-
- 
const char *
- 
pkg_file_uname(struct pkg_file const * const f)
- 
{
- 
	assert(f != NULL);
-
- 
	return (f->uname);
- 
}
-
- 
const char *
- 
pkg_file_gname(struct pkg_file const * const f)
- 
{
- 
	assert(f != NULL);
-
- 
	return (f->gname);
- 
}
- 


mode_t

pkg_file_mode(struct pkg_file const * const f)

{
@@ -219,27 +155,20 @@ pkg_dir_free(struct pkg_dir *d)
}



const char *
- 
pkg_dir_path(struct pkg_dir const * const d)
+ 
pkg_dir_get(struct pkg_dir const * const d, const pkg_dir_attr attr)

{

	assert(d != NULL);
-
- 
	return (d->path);
- 
}
-
- 
const char *
- 
pkg_dir_uname(struct pkg_dir const * const d)
- 
{
- 
	assert(d != NULL);
-
- 
	return (d->uname);
- 
}
-
- 
const char *
- 
pkg_dir_gname(struct pkg_dir const * const d)
- 
{
- 
	assert(d != NULL);
-
- 
	return (d->gname);
+ 
	switch (attr) {
+ 
	case PKG_DIR_PATH:
+ 
		return (d->path);
+ 
		break;
+ 
	case PKG_DIR_UNAME:
+ 
		return (d->uname);
+ 
		break;
+ 
	case PKG_DIR_GNAME:
+ 
		return (d->gname);
+ 
		break;
+ 
	}

}



mode_t