Date: Mon, 8 Jul 2013 21:54:52 GMT From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r254430 - in soc2013/mattbw/backend: . actions Message-ID: <201307082154.r68Lsq49037611@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mattbw Date: Mon Jul 8 21:54:51 2013 New Revision: 254430 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=254430 Log: rename actions files to match their C action names Added: soc2013/mattbw/backend/actions.h - copied, changed from r254404, soc2013/mattbw/backend/actions/actions.h soc2013/mattbw/backend/actions/get_details.c - copied, changed from r254408, soc2013/mattbw/backend/actions/get-details.c soc2013/mattbw/backend/actions/get_files.c - copied, changed from r254408, soc2013/mattbw/backend/actions/get-files.c soc2013/mattbw/backend/actions/get_repo_list.c - copied, changed from r254408, soc2013/mattbw/backend/actions/get-repo-list.c soc2013/mattbw/backend/actions/install_files.c - copied, changed from r254408, soc2013/mattbw/backend/actions/install-files.c soc2013/mattbw/backend/actions/install_packages.c - copied, changed from r254408, soc2013/mattbw/backend/actions/install-packages.c Deleted: soc2013/mattbw/backend/actions/actions.h soc2013/mattbw/backend/actions/get-details.c soc2013/mattbw/backend/actions/get-files.c soc2013/mattbw/backend/actions/get-repo-list.c soc2013/mattbw/backend/actions/install-files.c soc2013/mattbw/backend/actions/install-packages.c Modified: soc2013/mattbw/backend/Makefile soc2013/mattbw/backend/actions/resolve.c soc2013/mattbw/backend/pk-backend-pkgng.c Modified: soc2013/mattbw/backend/Makefile ============================================================================== --- soc2013/mattbw/backend/Makefile Mon Jul 8 21:47:32 2013 (r254429) +++ soc2013/mattbw/backend/Makefile Mon Jul 8 21:54:51 2013 (r254430) @@ -10,11 +10,11 @@ pkgutils.c \ utils.c SRCS+= \ - actions/get-details.c \ - actions/get-files.c \ - actions/get-repo-list.c \ - actions/install-files.c \ - actions/install-packages.c \ + actions/get_details.c \ + actions/get_files.c \ + actions/get_repo_list.c \ + actions/install_files.c \ + actions/install_packages.c \ actions/resolve.c SRCS+= \ Copied and modified: soc2013/mattbw/backend/actions.h (from r254404, soc2013/mattbw/backend/actions/actions.h) ============================================================================== --- soc2013/mattbw/backend/actions/actions.h Mon Jul 8 06:55:06 2013 (r254404, copy source) +++ soc2013/mattbw/backend/actions.h Mon Jul 8 21:54:51 2013 (r254430) @@ -22,7 +22,7 @@ #define _PKGNG_BACKEND_ACTIONS_H_ #include <glib.h> /* gboolean */ -#include "../pk-backend.h" /* PkBackend */ +#include "pk-backend.h" /* PkBackend */ /* * Each thread is implemented in its namesake C file, except simulations Copied and modified: soc2013/mattbw/backend/actions/get_details.c (from r254408, soc2013/mattbw/backend/actions/get-details.c) ============================================================================== --- soc2013/mattbw/backend/actions/get-details.c Mon Jul 8 11:55:21 2013 (r254408, copy source) +++ soc2013/mattbw/backend/actions/get_details.c Mon Jul 8 21:54:51 2013 (r254430) @@ -26,7 +26,7 @@ #include "../licenses.h" /* license_from_pkg */ #include "../query.h" /* query_... */ -#include "actions.h" /* get_details_thread prototype */ +#include "../actions.h" /* get_details_thread prototype */ static const unsigned int LOAD_FLAGS = PKG_LOAD_BASIC | PKG_LOAD_LICENSES; Copied and modified: soc2013/mattbw/backend/actions/get_files.c (from r254408, soc2013/mattbw/backend/actions/get-files.c) ============================================================================== --- soc2013/mattbw/backend/actions/get-files.c Mon Jul 8 11:55:21 2013 (r254408, copy source) +++ soc2013/mattbw/backend/actions/get_files.c Mon Jul 8 21:54:51 2013 (r254430) @@ -29,9 +29,8 @@ #include "../licenses.h" /* license_from_pkg */ #include "../query.h" /* query_... */ -#include "actions.h" /* get_files_thread prototype */ +#include "../actions.h" /* get_files_thread prototype */ -static const int FILE_NAME_STEP = 10; static const unsigned int LOAD_FLAGS = PKG_LOAD_BASIC | PKG_LOAD_FILES; static gboolean emit(struct pkg *pkg, const gchar *id, struct query *q); Copied and modified: soc2013/mattbw/backend/actions/get_repo_list.c (from r254408, soc2013/mattbw/backend/actions/get-repo-list.c) ============================================================================== --- soc2013/mattbw/backend/actions/get-repo-list.c Mon Jul 8 11:55:21 2013 (r254408, copy source) +++ soc2013/mattbw/backend/actions/get_repo_list.c Mon Jul 8 21:54:51 2013 (r254430) @@ -23,7 +23,7 @@ #include "pkg.h" #include "../hash_traverse.h" /* HASH_FOR */ -#include "actions.h" /* get_repo_list_thread prototype */ +#include "../actions.h" /* get_repo_list_thread prototype */ /* * The thread that performs a GetRepoList operation. Should be invoked by the @@ -42,9 +42,9 @@ for (HASH_FOR(err, pkg_repos, &repo)) pk_backend_repo_detail(backend, - pkg_repo_ident(repo), - pkg_repo_name(repo), - pkg_repo_enabled(repo)); + pkg_repo_ident(repo), + pkg_repo_name(repo), + pkg_repo_enabled(repo)); (void)pk_backend_set_percentage(backend, 100); (void)pk_backend_finished(backend); Copied and modified: soc2013/mattbw/backend/actions/install_files.c (from r254408, soc2013/mattbw/backend/actions/install-files.c) ============================================================================== --- soc2013/mattbw/backend/actions/install-files.c Mon Jul 8 11:55:21 2013 (r254408, copy source) +++ soc2013/mattbw/backend/actions/install_files.c Mon Jul 8 21:54:51 2013 (r254430) @@ -27,7 +27,7 @@ #include "../pkgutils.h" /* pkgutils_... */ #include "../utils.h" /* INTENTIONALLY_IGNORE */ -#include "actions.h" /* install_files_thread prototype */ +#include "../actions.h" /* install_files_thread prototype */ static gboolean do_file(const gchar *path, PkBackend *backend, gboolean simulate); static gboolean do_files(PkBackend *backend, gboolean simulate); Copied and modified: soc2013/mattbw/backend/actions/install_packages.c (from r254408, soc2013/mattbw/backend/actions/install-packages.c) ============================================================================== --- soc2013/mattbw/backend/actions/install-packages.c Mon Jul 8 11:55:21 2013 (r254408, copy source) +++ soc2013/mattbw/backend/actions/install_packages.c Mon Jul 8 21:54:51 2013 (r254430) @@ -27,14 +27,13 @@ #include "../query.h" /* query_... */ #include "../utils.h" /* INTENTIONALLY_IGNORE */ -#include "actions.h" /* install_packages_thread prototype */ +#include "../actions.h" /* install_packages_thread prototype */ static gboolean job(struct pkg_jobs *jobs, struct query *q); static gboolean sim_job(struct pkg_jobs *jobs, struct query *q); static gboolean solve_job(struct query *q, struct pkg_jobs *jobs); static int install_event_cb(void *backend_v, struct pkg_event *event); - /* * The thread that performs an InstallPackages operation. Should be invoked * by the pk_backend_install_packages hook. Modified: soc2013/mattbw/backend/actions/resolve.c ============================================================================== --- soc2013/mattbw/backend/actions/resolve.c Mon Jul 8 21:47:32 2013 (r254429) +++ soc2013/mattbw/backend/actions/resolve.c Mon Jul 8 21:54:51 2013 (r254430) @@ -25,7 +25,7 @@ #include "../pkgutils.h" /* pkgutils_* */ #include "../query.h" /* query_* */ #include "../utils.h" /* INTENTIONALLY_IGNORE */ -#include "actions.h" /* Prototype */ +#include "../actions.h" /* Prototype */ static gboolean emit(struct pkg *pkg, const gchar *id, struct query *q); Modified: soc2013/mattbw/backend/pk-backend-pkgng.c ============================================================================== --- soc2013/mattbw/backend/pk-backend-pkgng.c Mon Jul 8 21:47:32 2013 (r254429) +++ soc2013/mattbw/backend/pk-backend-pkgng.c Mon Jul 8 21:54:51 2013 (r254430) @@ -29,7 +29,7 @@ #include "utils.h" /* INTENTIONALLY_IGNORE */ #include "groups.h" /* available_groups */ -#include "actions/actions.h" /* Actions threads */ +#include "actions.h" /* Actions threads */ /** * pk_backend_initialize:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307082154.r68Lsq49037611>