PERFORCE change 125204 for review
Garrett Cooper
gcooper at FreeBSD.org
Wed Aug 15 23:00:27 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=125204
Change 125204 by gcooper at optimus-revised_pkgtools on 2007/08/16 05:59:33
Make libpkg contrib code style(7) friendly.
See scripts/styleify.pl. This script converts double tabs to single tabs,
and single tabs to 4 spaces, skipping over comments, thus conforming to
style(7)'s simpler whitespace requirements.
Affected files ...
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/archive_read_open_stream.c#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg.c#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg.h#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_db.c#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_db.h#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_db_match.c#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_db_private.h#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_manifest.c#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_private.h#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_repo.c#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_repo.h#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_repo_files.c#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_repo_ftp.c#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_repo_private.h#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_util.c#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkgfile.c#2 edit
.. //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/scripts/styleify.pl#1 add
Differences ...
==== //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/archive_read_open_stream.c#2 (text+ko) ====
@@ -35,70 +35,70 @@
#include "archive.h"
struct read_stream_data {
- FILE *fd;
- size_t block_size;
- void *buffer;
+ FILE *fd;
+ size_t block_size;
+ void *buffer;
};
int archive_read_open_stream(struct archive *, FILE *, size_t);
-static int stream_close(struct archive *, void *);
-static int stream_open(struct archive *, void *);
-static ssize_t stream_read(struct archive *, void *, const void **buff);
+static int stream_close(struct archive *, void *);
+static int stream_open(struct archive *, void *);
+static ssize_t stream_read(struct archive *, void *, const void **buff);
int
archive_read_open_stream(struct archive *a, FILE *fd, size_t block_size)
{
- struct read_stream_data *mine;
+ struct read_stream_data *mine;
- mine = malloc(sizeof(*mine));
- if (mine == NULL) {
- archive_set_error(a, ENOMEM, "No memory");
- return (ARCHIVE_FATAL);
- }
- mine->block_size = block_size;
- mine->buffer = malloc(mine->block_size);
- if (mine->buffer == NULL) {
- archive_set_error(a, ENOMEM, "No memory");
- free(mine);
- return (ARCHIVE_FATAL);
- }
- mine->fd = fd;
- return (archive_read_open(a, mine, stream_open, stream_read, stream_close));
+ mine = malloc(sizeof(*mine));
+ if (mine == NULL) {
+ archive_set_error(a, ENOMEM, "No memory");
+ return (ARCHIVE_FATAL);
+ }
+ mine->block_size = block_size;
+ mine->buffer = malloc(mine->block_size);
+ if (mine->buffer == NULL) {
+ archive_set_error(a, ENOMEM, "No memory");
+ free(mine);
+ return (ARCHIVE_FATAL);
+ }
+ mine->fd = fd;
+ return (archive_read_open(a, mine, stream_open, stream_read, stream_close));
}
static int
stream_open(struct archive *a, void *client_data)
{
- struct read_stream_data *mine = client_data;
+ struct read_stream_data *mine = client_data;
- (void)a; /* UNUSED */
- if (mine->fd == NULL) {
- archive_set_error(a, EINVAL, "Bad FILE pointer");
- free(mine->buffer);
- free(mine);
- return (ARCHIVE_FATAL);
- }
- return (ARCHIVE_OK);
+ (void)a; /* UNUSED */
+ if (mine->fd == NULL) {
+ archive_set_error(a, EINVAL, "Bad FILE pointer");
+ free(mine->buffer);
+ free(mine);
+ return (ARCHIVE_FATAL);
+ }
+ return (ARCHIVE_OK);
}
static ssize_t
stream_read(struct archive *a, void *client_data, const void **buff)
{
- struct read_stream_data *mine = client_data;
+ struct read_stream_data *mine = client_data;
- (void)a; /* UNUSED */
- *buff = mine->buffer;
- return fread(mine->buffer, 1, mine->block_size, mine->fd);
+ (void)a; /* UNUSED */
+ *buff = mine->buffer;
+ return fread(mine->buffer, 1, mine->block_size, mine->fd);
}
static int
stream_close(struct archive *a, void *client_data)
{
- struct read_stream_data *mine = client_data;
+ struct read_stream_data *mine = client_data;
- (void)a; /* UNUSED */
- free(mine->buffer);
- free(mine);
- return (ARCHIVE_OK);
-}
+ (void)a; /* UNUSED */
+ free(mine->buffer);
+ free(mine);
+ return (ARCHIVE_OK);
+}
==== //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg.c#2 (text+ko) ====
@@ -55,57 +55,57 @@
*/
struct pkg *
pkg_new(const char *pkg_name,
- pkg_get_control_files_callback *control_files,
- pkg_get_control_file_callback *control_file,
- pkg_get_manifest_callback *get_manifest,
- pkg_get_dependencies_callback *get_deps,
- pkg_get_dependencies_callback *get_rdeps,
- pkg_free_callback *free_pkg)
+ pkg_get_control_files_callback *control_files,
+ pkg_get_control_file_callback *control_file,
+ pkg_get_manifest_callback *get_manifest,
+ pkg_get_dependencies_callback *get_deps,
+ pkg_get_dependencies_callback *get_rdeps,
+ pkg_free_callback *free_pkg)
{
- struct pkg *pkg;
+ struct pkg *pkg;
- /* A package must have a name */
- if (pkg_name == NULL)
- return NULL;
+ /* A package must have a name */
+ if (pkg_name == NULL)
+ return NULL;
- pkg = malloc(sizeof(struct pkg));
- if (!pkg) {
- return NULL;
- }
+ pkg = malloc(sizeof(struct pkg));
+ if (!pkg) {
+ return NULL;
+ }
- pkg->pkg_name = strdup(pkg_name);
- if (!pkg->pkg_name) {
- free(pkg);
- return NULL;
- }
+ pkg->pkg_name = strdup(pkg_name);
+ if (!pkg->pkg_name) {
+ free(pkg);
+ return NULL;
+ }
- /* Set the manifest to NULL */
- pkg->pkg_manifest = NULL;
+ /* Set the manifest to NULL */
+ pkg->pkg_manifest = NULL;
- /* Add the given callbacks to the struct */
- pkg->pkg_get_control_files = control_files;
- pkg->pkg_get_control_file = control_file;
- pkg->pkg_get_manifest = get_manifest;
- pkg->pkg_get_deps = get_deps;
- pkg->pkg_get_rdeps = get_rdeps;
- pkg->pkg_free = free_pkg;
+ /* Add the given callbacks to the struct */
+ pkg->pkg_get_control_files = control_files;
+ pkg->pkg_get_control_file = control_file;
+ pkg->pkg_get_manifest = get_manifest;
+ pkg->pkg_get_deps = get_deps;
+ pkg->pkg_get_rdeps = get_rdeps;
+ pkg->pkg_free = free_pkg;
- /* Set the other callbacks to NULL */
- pkg->pkg_get_version = NULL;
- pkg->pkg_get_origin = NULL;
- pkg->pkg_set_origin = NULL;
- pkg->pkg_add_depend = NULL;
- pkg->pkg_add_file = NULL;
- pkg->pkg_get_next_file = NULL;
- pkg->pkg_run_script = NULL;
- pkg->pkg_install = NULL;
- pkg->pkg_deinstall = NULL;
+ /* Set the other callbacks to NULL */
+ pkg->pkg_get_version = NULL;
+ pkg->pkg_get_origin = NULL;
+ pkg->pkg_set_origin = NULL;
+ pkg->pkg_add_depend = NULL;
+ pkg->pkg_add_file = NULL;
+ pkg->pkg_get_next_file = NULL;
+ pkg->pkg_run_script = NULL;
+ pkg->pkg_install = NULL;
+ pkg->pkg_deinstall = NULL;
- /* The data is unknown so set to NULL */
- pkg->pkg_prefix = NULL;
- pkg->data = NULL;
+ /* The data is unknown so set to NULL */
+ pkg->pkg_prefix = NULL;
+ pkg->data = NULL;
- return pkg;
+ return pkg;
}
/**
@@ -120,17 +120,17 @@
*/
int
pkg_add_callbacks_data(struct pkg *pkg,
- pkg_get_version_callback *get_version,
- pkg_get_origin_callback *get_origin,
- pkg_set_origin_callback *set_origin)
+ pkg_get_version_callback *get_version,
+ pkg_get_origin_callback *get_origin,
+ pkg_set_origin_callback *set_origin)
{
- if (pkg == NULL)
- return -1;
+ if (pkg == NULL)
+ return -1;
- pkg->pkg_get_version = get_version;
- pkg->pkg_get_origin = get_origin;
- pkg->pkg_set_origin = set_origin;
- return 0;
+ pkg->pkg_get_version = get_version;
+ pkg->pkg_get_origin = get_origin;
+ pkg->pkg_set_origin = set_origin;
+ return 0;
}
/**
@@ -143,16 +143,16 @@
*/
int
pkg_add_callbacks_empty(struct pkg *pkg,
- pkg_add_dependency_callback *add_depend,
- pkg_add_file_callback *add_file)
+ pkg_add_dependency_callback *add_depend,
+ pkg_add_file_callback *add_file)
{
- if (pkg == NULL)
- return -1;
+ if (pkg == NULL)
+ return -1;
- pkg->pkg_add_depend = add_depend;
- pkg->pkg_add_file = add_file;
+ pkg->pkg_add_depend = add_depend;
+ pkg->pkg_add_file = add_file;
- return 0;
+ return 0;
}
/**
@@ -167,19 +167,19 @@
*/
int
pkg_add_callbacks_install (struct pkg *pkg,
- pkg_install_callback *install,
- pkg_deinstall_callback *deinstall,
- pkg_get_next_file_callback *next_file,
- pkg_run_script_callback *run_script)
+ pkg_install_callback *install,
+ pkg_deinstall_callback *deinstall,
+ pkg_get_next_file_callback *next_file,
+ pkg_run_script_callback *run_script)
{
- if (pkg == NULL)
- return -1;
+ if (pkg == NULL)
+ return -1;
- pkg->pkg_install = install;
- pkg->pkg_deinstall = deinstall;
- pkg->pkg_get_next_file = next_file;
- pkg->pkg_run_script = run_script;
- return 0;
+ pkg->pkg_install = install;
+ pkg->pkg_deinstall = deinstall;
+ pkg->pkg_get_next_file = next_file;
+ pkg->pkg_run_script = run_script;
+ return 0;
}
/**
@@ -208,7 +208,7 @@
struct pkg*
pkg_new_empty(const char *pkg_name)
{
- return pkg_new(pkg_name, NULL, NULL, NULL, NULL, NULL, NULL);
+ return pkg_new(pkg_name, NULL, NULL, NULL, NULL, NULL, NULL);
}
/**
@@ -225,8 +225,8 @@
int
pkg_compare(const void *pkg_a, const void *pkg_b)
{
- return strcmp((*(struct pkg * const *)pkg_a)->pkg_name,
- (*(struct pkg * const *)pkg_b)->pkg_name);
+ return strcmp((*(struct pkg * const *)pkg_a)->pkg_name,
+ (*(struct pkg * const *)pkg_b)->pkg_name);
}
/**
@@ -241,23 +241,23 @@
int
pkg_set_prefix(struct pkg *pkg, const char *prefix)
{
- char *old_prefix;
- if (pkg == NULL)
- return -1;
+ char *old_prefix;
+ if (pkg == NULL)
+ return -1;
- if (prefix == NULL)
- return -1;
+ if (prefix == NULL)
+ return -1;
- old_prefix = pkg->pkg_prefix;
- pkg->pkg_prefix = strdup(prefix);
- if (pkg->pkg_prefix == NULL) {
- pkg->pkg_prefix = old_prefix;
- return -1;
- }
- if (old_prefix != NULL)
- free(old_prefix);
+ old_prefix = pkg->pkg_prefix;
+ pkg->pkg_prefix = strdup(prefix);
+ if (pkg->pkg_prefix == NULL) {
+ pkg->pkg_prefix = old_prefix;
+ return -1;
+ }
+ if (old_prefix != NULL)
+ free(old_prefix);
- return 0;
+ return 0;
}
/**
@@ -268,19 +268,19 @@
const char *
pkg_get_prefix(struct pkg *pkg)
{
- if (pkg == NULL)
- return NULL;
+ if (pkg == NULL)
+ return NULL;
- /* Read the prefix from the manifest */
- if (pkg->pkg_prefix == NULL && pkg->pkg_manifest != NULL) {
- const char *prefix;
+ /* Read the prefix from the manifest */
+ if (pkg->pkg_prefix == NULL && pkg->pkg_manifest != NULL) {
+ const char *prefix;
- prefix = (const char *)pkg_manifest_get_attr(pkg->pkg_manifest,
- pkgm_prefix);
- pkg_set_prefix(pkg, prefix);
- }
+ prefix = (const char *)pkg_manifest_get_attr(pkg->pkg_manifest,
+ pkgm_prefix);
+ pkg_set_prefix(pkg, prefix);
+ }
- return pkg->pkg_prefix;
+ return pkg->pkg_prefix;
}
/**
@@ -292,14 +292,14 @@
const char **
pkg_get_conflicts(struct pkg *pkg)
{
- if (pkg == NULL)
- return NULL;
+ if (pkg == NULL)
+ return NULL;
- /* Read the manifest */
- pkg_get_manifest(pkg);
+ /* Read the manifest */
+ pkg_get_manifest(pkg);
- /* Get the conflicts */
- return pkg_manifest_get_conflicts(pkg->pkg_manifest);
+ /* Get the conflicts */
+ return pkg_manifest_get_conflicts(pkg->pkg_manifest);
}
/**
@@ -311,13 +311,13 @@
struct pkgfile **
pkg_get_control_files(struct pkg *pkg)
{
- if (!pkg)
- return NULL;
+ if (!pkg)
+ return NULL;
- if (!pkg->pkg_get_control_files)
- return NULL;
+ if (!pkg->pkg_get_control_files)
+ return NULL;
- return pkg->pkg_get_control_files(pkg);
+ return pkg->pkg_get_control_files(pkg);
}
/**
@@ -329,13 +329,13 @@
struct pkgfile *
pkg_get_control_file(struct pkg *pkg, const char *pkg_name)
{
- if (!pkg || !pkg_name)
- return NULL;
+ if (!pkg || !pkg_name)
+ return NULL;
- if (pkg->pkg_get_control_file)
- return pkg->pkg_get_control_file(pkg, pkg_name);
+ if (pkg->pkg_get_control_file)
+ return pkg->pkg_get_control_file(pkg, pkg_name);
- return NULL;
+ return NULL;
}
/**
@@ -348,16 +348,16 @@
struct pkg **
pkg_get_dependencies(struct pkg *pkg)
{
- if (!pkg)
- return NULL;
+ if (!pkg)
+ return NULL;
- assert(pkg->pkg_get_deps == NULL ||
- pkg->pkg_get_deps != pkg->pkg_get_rdeps);
+ assert(pkg->pkg_get_deps == NULL ||
+ pkg->pkg_get_deps != pkg->pkg_get_rdeps);
- if (pkg->pkg_get_deps)
- return pkg->pkg_get_deps(pkg);
+ if (pkg->pkg_get_deps)
+ return pkg->pkg_get_deps(pkg);
- return NULL;
+ return NULL;
}
/**
@@ -374,15 +374,15 @@
struct pkg **
pkg_get_reverse_dependencies(struct pkg *pkg)
{
- if (!pkg)
- return NULL;
+ if (!pkg)
+ return NULL;
- assert(pkg->pkg_get_rdeps == NULL ||
- pkg->pkg_get_deps != pkg->pkg_get_rdeps);
- if (pkg->pkg_get_rdeps != NULL)
- return pkg->pkg_get_rdeps(pkg);
+ assert(pkg->pkg_get_rdeps == NULL ||
+ pkg->pkg_get_deps != pkg->pkg_get_rdeps);
+ if (pkg->pkg_get_rdeps != NULL)
+ return pkg->pkg_get_rdeps(pkg);
- return NULL;
+ return NULL;
}
/**
@@ -394,13 +394,13 @@
struct pkg_manifest *
pkg_get_manifest(struct pkg *pkg)
{
- if (pkg == NULL)
- return NULL;
+ if (pkg == NULL)
+ return NULL;
- if (pkg->pkg_manifest == NULL && pkg->pkg_get_manifest != NULL)
- pkg->pkg_get_manifest(pkg);
+ if (pkg->pkg_manifest == NULL && pkg->pkg_get_manifest != NULL)
+ pkg->pkg_get_manifest(pkg);
- return pkg->pkg_manifest;
+ return pkg->pkg_manifest;
}
/**
@@ -412,9 +412,9 @@
const char *
pkg_get_name(struct pkg *pkg)
{
- if (!pkg)
- return NULL;
- return pkg->pkg_name;
+ if (!pkg)
+ return NULL;
+ return pkg->pkg_name;
}
/**
@@ -428,13 +428,13 @@
struct pkgfile *
pkg_get_next_file(struct pkg *pkg)
{
- if (!pkg)
- return NULL;
+ if (!pkg)
+ return NULL;
- if (!pkg->pkg_get_next_file)
- return NULL;
+ if (!pkg->pkg_get_next_file)
+ return NULL;
- return pkg->pkg_get_next_file(pkg);
+ return pkg->pkg_get_next_file(pkg);
}
/**
@@ -448,13 +448,13 @@
const char *
pkg_get_origin(struct pkg *pkg)
{
- if (pkg == NULL)
- return NULL;
+ if (pkg == NULL)
+ return NULL;
- if (pkg->pkg_get_origin != NULL)
- return pkg->pkg_get_origin(pkg);
+ if (pkg->pkg_get_origin != NULL)
+ return pkg->pkg_get_origin(pkg);
- return NULL;
+ return NULL;
}
/**
@@ -471,13 +471,13 @@
int
pkg_set_origin(struct pkg *pkg, const char *origin)
{
- if (pkg == NULL || origin == NULL)
- return -1;
+ if (pkg == NULL || origin == NULL)
+ return -1;
- if (pkg->pkg_set_origin)
- return pkg->pkg_set_origin(pkg, origin);
+ if (pkg->pkg_set_origin)
+ return pkg->pkg_set_origin(pkg, origin);
- return -1;
+ return -1;
}
/**
@@ -491,13 +491,13 @@
const char *
pkg_get_version(struct pkg *pkg)
{
- if (pkg == NULL)
- return NULL;
+ if (pkg == NULL)
+ return NULL;
- if (pkg->pkg_get_version != NULL)
- return pkg->pkg_get_version(pkg);
+ if (pkg->pkg_get_version != NULL)
+ return pkg->pkg_get_version(pkg);
- return NULL;
+ return NULL;
}
/**
@@ -510,13 +510,13 @@
int
pkg_run_script(struct pkg *pkg, const char *prefix, pkg_script script)
{
- if (pkg == NULL)
- return -1;
+ if (pkg == NULL)
+ return -1;
- if (pkg->pkg_run_script == NULL)
- return -1;
+ if (pkg->pkg_run_script == NULL)
+ return -1;
- return pkg->pkg_run_script(pkg, prefix, script);
+ return pkg->pkg_run_script(pkg, prefix, script);
}
/**
@@ -528,13 +528,13 @@
int
pkg_add_dependency(struct pkg *pkg, struct pkg *depend)
{
- if (!pkg || !depend)
- return -1;
+ if (!pkg || !depend)
+ return -1;
- if (pkg->pkg_add_depend)
- return pkg->pkg_add_depend(pkg, depend);
+ if (pkg->pkg_add_depend)
+ return pkg->pkg_add_depend(pkg, depend);
- return -1;
+ return -1;
}
/**
@@ -546,13 +546,13 @@
int
pkg_add_file(struct pkg *pkg, struct pkgfile *file)
{
- if (!pkg || !file)
- return -1;
+ if (!pkg || !file)
+ return -1;
- if (pkg->pkg_add_file)
- return pkg->pkg_add_file(pkg, file);
+ if (pkg->pkg_add_file)
+ return pkg->pkg_add_file(pkg, file);
- return -1;
+ return -1;
}
/**
@@ -578,19 +578,19 @@
*/
int
pkg_install(struct pkg *pkg, const char *prefix, int reg,
- pkg_db_action *pkg_action, void *data, pkg_db_chdir *db_chdir,
- pkg_db_install_file *install_file, pkg_db_exec *do_exec,
- pkg_db_register *pkg_register)
+ pkg_db_action *pkg_action, void *data, pkg_db_chdir *db_chdir,
+ pkg_db_install_file *install_file, pkg_db_exec *do_exec,
+ pkg_db_register *pkg_register)
{
- if (pkg == NULL || data == NULL || db_chdir == NULL ||
- install_file == NULL || do_exec == NULL || pkg_register == NULL)
- return -1;
+ if (pkg == NULL || data == NULL || db_chdir == NULL ||
+ install_file == NULL || do_exec == NULL || pkg_register == NULL)
+ return -1;
- if (pkg->pkg_install == NULL)
- return -1;
+ if (pkg->pkg_install == NULL)
+ return -1;
- return pkg->pkg_install(pkg, prefix, reg, pkg_action, data, db_chdir,
- install_file, do_exec, pkg_register);
+ return pkg->pkg_install(pkg, prefix, reg, pkg_action, data, db_chdir,
+ install_file, do_exec, pkg_register);
}
/**
@@ -615,18 +615,18 @@
*/
int
pkg_deinstall(struct pkg *pkg, pkg_db_action *pkg_action, void *data,
- pkg_db_chdir *db_chdir, pkg_db_install_file *deinstall_file,
- pkg_db_exec *do_exec, pkg_db_deregister *pkg_deregister)
+ pkg_db_chdir *db_chdir, pkg_db_install_file *deinstall_file,
+ pkg_db_exec *do_exec, pkg_db_deregister *pkg_deregister)
{
- if (pkg == NULL || data == NULL || db_chdir == NULL ||
- deinstall_file == NULL || do_exec == NULL || pkg_deregister == NULL)
- return -1;
+ if (pkg == NULL || data == NULL || db_chdir == NULL ||
+ deinstall_file == NULL || do_exec == NULL || pkg_deregister == NULL)
+ return -1;
- if (pkg->pkg_deinstall == NULL)
- return -1;
+ if (pkg->pkg_deinstall == NULL)
+ return -1;
- return pkg->pkg_deinstall(pkg, pkg_action, data, db_chdir,
- deinstall_file, do_exec, pkg_deregister);
+ return pkg->pkg_deinstall(pkg, pkg_action, data, db_chdir,
+ deinstall_file, do_exec, pkg_deregister);
}
/**
@@ -640,16 +640,16 @@
int
pkg_list_free(struct pkg **pkgs)
{
- unsigned int cur;
+ unsigned int cur;
- if (!pkgs)
- return -1;
+ if (!pkgs)
+ return -1;
- for (cur = 0; pkgs[cur] != NULL; cur++)
- pkg_free(pkgs[cur]);
+ for (cur = 0; pkgs[cur] != NULL; cur++)
+ pkg_free(pkgs[cur]);
- free(pkgs);
- return 0;
+ free(pkgs);
+ return 0;
}
/**
@@ -660,26 +660,26 @@
int
pkg_free(struct pkg *pkg)
{
- if (!pkg)
- return -1;
+ if (!pkg)
+ return -1;
- if (pkg->pkg_name != NULL)
- free(pkg->pkg_name);
+ if (pkg->pkg_name != NULL)
+ free(pkg->pkg_name);
- if (pkg->pkg_prefix != NULL)
- free(pkg->pkg_prefix);
+ if (pkg->pkg_prefix != NULL)
+ free(pkg->pkg_prefix);
- if (pkg->pkg_manifest != NULL)
- pkg_manifest_free(pkg->pkg_manifest);
+ if (pkg->pkg_manifest != NULL)
+ pkg_manifest_free(pkg->pkg_manifest);
- if (pkg->pkg_free != NULL)
- pkg->pkg_free(pkg);
+ if (pkg->pkg_free != NULL)
+ pkg->pkg_free(pkg);
- free(pkg);
+ free(pkg);
- return 0;
+ return 0;
}
/**
* @}
- */
+ */
==== //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg.h#2 (text+ko) ====
==== //depot/projects/soc2007/revised_fbsd_pkgtools/v2/contrib/libpkg/pkg_db.c#2 (text+ko) ====
@@ -54,56 +54,56 @@
*/
struct pkg_db*
pkg_db_open(const char *base, pkg_db_install_pkg_callback *install_pkg,
- pkg_db_is_installed_callback *is_installed,
- pkg_db_get_installed_match_callback *get_installed_match,
- pkg_db_get_package_callback *get_package,
- pkg_db_deinstall_pkg_callback* deinstall)
+ pkg_db_is_installed_callback *is_installed,
+ pkg_db_get_installed_match_callback *get_installed_match,
+ pkg_db_get_package_callback *get_package,
+ pkg_db_deinstall_pkg_callback* deinstall)
{
- struct pkg_db *db;
- struct stat sb;
+ struct pkg_db *db;
+ struct stat sb;
- db = malloc(sizeof(struct pkg_db));
- if (!db) {
- return NULL;
- }
+ db = malloc(sizeof(struct pkg_db));
+ if (!db) {
+ return NULL;
+ }
- /* Make a relative path into an absolute path */
- if (base == NULL) {
- db->db_base = strdup("/");
- } else if (base[0] != '/') {
- char *cwd;
+ /* Make a relative path into an absolute path */
+ if (base == NULL) {
+ db->db_base = strdup("/");
+ } else if (base[0] != '/') {
+ char *cwd;
- cwd = getcwd(NULL, 0);
- asprintf(&db->db_base, "%s/%s", cwd, base);
- free(cwd);
- } else {
- db->db_base = strdup(base);
- }
+ cwd = getcwd(NULL, 0);
+ asprintf(&db->db_base, "%s/%s", cwd, base);
+ free(cwd);
+ } else {
+ db->db_base = strdup(base);
+ }
- if (!db->db_base) {
- free(db);
- return NULL;
- }
+ if (!db->db_base) {
+ free(db);
+ return NULL;
+ }
- /* Check the directory exists and is a directory */
- if (stat(db->db_base, &sb) == -1) {
- pkg_db_free(db);
- return NULL;
- } else if (!S_ISDIR(sb.st_mode)) {
- pkg_db_free(db);
- return NULL;
- }
+ /* Check the directory exists and is a directory */
+ if (stat(db->db_base, &sb) == -1) {
+ pkg_db_free(db);
+ return NULL;
+ } else if (!S_ISDIR(sb.st_mode)) {
+ pkg_db_free(db);
+ return NULL;
+ }
- /* Add the callbacks */
- db->pkg_install = install_pkg;
- db->pkg_is_installed = is_installed;
- db->pkg_get_installed_match = get_installed_match;
- db->pkg_get_package = get_package;
- db->pkg_deinstall = deinstall;
+ /* Add the callbacks */
+ db->pkg_install = install_pkg;
+ db->pkg_is_installed = is_installed;
+ db->pkg_get_installed_match = get_installed_match;
+ db->pkg_get_package = get_package;
+ db->pkg_deinstall = deinstall;
- db->data = NULL;
+ db->data = NULL;
- return db;
+ return db;
}
/**
@@ -115,7 +115,7 @@
*/
void
pkg_action_null(enum pkg_action_level level __unused, const char *fmt __unused,
- ...)
+ ...)
{
}
@@ -151,22 +151,22 @@
pkg_db_install_pkg_action(struct pkg_db *db, struct pkg *pkg,
const char *prefix, int reg, int scripts, int fake, pkg_db_action *action)
{
- if (!db) {
- return -1;
- }
+ if (!db) {
+ return -1;
+ }
- if (!pkg) {
- return -1;
- }
+ if (!pkg) {
+ return -1;
+ }
- if (!db->pkg_install) {
- return -1;
- }
+ if (!db->pkg_install) {
+ return -1;
+ }
- if (action == NULL)
- return -1;
+ if (action == NULL)
+ return -1;
- return db->pkg_install(db, pkg, prefix, reg, scripts, fake, action);
+ return db->pkg_install(db, pkg, prefix, reg, scripts, fake, action);
}
/**
@@ -176,15 +176,15 @@
int
pkg_db_is_installed(struct pkg_db *db, struct pkg *pkg)
{
- if (!db) {
- return -1;
- }
+ if (!db) {
+ return -1;
+ }
- if (!db->pkg_is_installed) {
- return -1;
- }
+ if (!db->pkg_is_installed) {
+ return -1;
+ }
- return db->pkg_is_installed(db, pkg);
+ return db->pkg_is_installed(db, pkg);
}
/**
@@ -194,7 +194,7 @@
struct pkg **
pkg_db_get_installed(struct pkg_db *db)
{
- return pkg_db_get_installed_match(db, NULL, NULL);
+ return pkg_db_get_installed_match(db, NULL, NULL);
}
/**
@@ -210,7 +210,7 @@
pkg_db_get_installed_match(struct pkg_db *db, pkg_db_match *match,
const void *data)
{
- return pkg_db_get_installed_match_count(db, match, 0, data);
+ return pkg_db_get_installed_match_count(db, match, 0, data);
}
/**
@@ -227,16 +227,16 @@
pkg_db_get_installed_match_count(struct pkg_db *db, pkg_db_match *match,
unsigned int count, const void *data)
{
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list