socsvn commit: r257115 - soc2013/mattbw/backend/jobs
mattbw at FreeBSD.org
mattbw at FreeBSD.org
Sun Sep 8 11:08:34 UTC 2013
Author: mattbw
Date: Sun Sep 8 11:08:34 2013
New Revision: 257115
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257115
Log:
And also indent jobs.
Modified:
soc2013/mattbw/backend/jobs/check_test.c
soc2013/mattbw/backend/jobs/core.c
soc2013/mattbw/backend/jobs/core.h
soc2013/mattbw/backend/jobs/do.c
soc2013/mattbw/backend/jobs/do.h
Modified: soc2013/mattbw/backend/jobs/check_test.c
==============================================================================
--- soc2013/mattbw/backend/jobs/check_test.c Sun Sep 8 11:06:21 2013 (r257114)
+++ soc2013/mattbw/backend/jobs/check_test.c Sun Sep 8 11:08:34 2013 (r257115)
@@ -38,7 +38,7 @@
ATF_TC_BODY(check_id_on_package_no_match, tc)
{
struct pkg *package;
- struct query_id id;
+ struct query_id id;
package = gen_pkg(PKG_REMOTE);
ATF_REQUIRE(package != NULL);
@@ -65,7 +65,7 @@
ATF_TC_BODY(check_id_on_package_partial_match, tc)
{
struct pkg *package;
- struct query_id id;
+ struct query_id id;
package = gen_pkg(PKG_REMOTE);
ATF_REQUIRE(package != NULL);
@@ -100,7 +100,7 @@
ATF_TC_BODY(check_id_on_package_full_match, tc)
{
struct pkg *package;
- struct query_id id;
+ struct query_id id;
package = gen_pkg(PKG_REMOTE);
ATF_REQUIRE(package != NULL);
Modified: soc2013/mattbw/backend/jobs/core.c
==============================================================================
--- soc2013/mattbw/backend/jobs/core.c Sun Sep 8 11:06:21 2013 (r257114)
+++ soc2013/mattbw/backend/jobs/core.c Sun Sep 8 11:08:34 2013 (r257115)
@@ -41,14 +41,14 @@
"This shouldn't occur and is a bug.", /* EPKG_OK */
"This shouldn't occur and is a bug.", /* EPKG_END */
"This shouldn't occur and is a bug.", /* EPKG_WARN */
- "Fatal error.", /* EPKG_FATAL */
+ "Fatal error.", /* EPKG_FATAL */
"Package required by another package.", /* EPKG_REQUIRED */
- "Already installed.", /* EPKG_INSTALLED */
- "Unresolved dependencies.", /* EPKG_DEPENDENCY */
+ "Already installed.", /* EPKG_INSTALLED */
+ "Unresolved dependencies.", /* EPKG_DEPENDENCY */
"A package is currently locked.", /* EPKG_LOCKED */
"No usable database available.", /* EPKG_ENODB */
"Local file newer than remote file.", /* EPKG_UPTODATE */
- "Unknown keyword.", /* EPKG_UNKNOWN */
+ "Unknown keyword.", /* EPKG_UNKNOWN */
"Incompatible repo schema version", /* EPKG_REPOSCHEMA */
"Insufficient privilege for action.", /* EPKG_ENOACCESS */
"Insecure privileges on DB file." /* EPKG_INSECURE */
@@ -82,7 +82,6 @@
ERR(backend, job_failed, error_string);
}
-
return (err == EPKG_OK);
}
@@ -90,7 +89,7 @@
jobs_set_repo(struct pkg_jobs *jobs, const char *reponame)
{
bool success;
- enum repo_type type;
+ enum repo_type type;
assert(jobs != NULL);
@@ -106,18 +105,18 @@
pkg_repo_ident_from_name(reponame));
success = (err == EPKG_OK);
}
-
return success;
}
-/* Adds each PackageID into an already created job. Returns NULL on failure
- * and a vector of added package name-versions to be freed after solution
- * on success.
+/*
+ * Adds each PackageID into an already created job. Returns NULL on failure
+ * and a vector of added package name-versions to be freed after solution on
+ * success.
*/
-char **
+char **
jobs_add_package_ids(struct pkg_jobs *jobs, gchar **package_ids, guint count)
{
- char **namevers;
+ char **namevers;
assert(jobs != NULL);
assert(package_ids != NULL);
@@ -134,7 +133,6 @@
namever_array_free(&namevers, count);
}
}
-
return namevers;
}
@@ -170,7 +168,6 @@
if (err != EPKG_OK && jobs != NULL) {
jobs_free(&jobs);
}
-
assert(err == EPKG_OK || jobs == NULL);
assert(err != EPKG_OK || jobs != NULL);
Modified: soc2013/mattbw/backend/jobs/core.h
==============================================================================
--- soc2013/mattbw/backend/jobs/core.h Sun Sep 8 11:06:21 2013 (r257114)
+++ soc2013/mattbw/backend/jobs/core.h Sun Sep 8 11:08:34 2013 (r257115)
@@ -24,13 +24,13 @@
#include <stdbool.h> /* bool */
#include "../pk-backend.h" /* PkBackend */
-typedef PkInfoEnum (*pkg_info_ptr) (struct pkg *pkg);
+typedef PkInfoEnum(*pkg_info_ptr) (struct pkg *pkg);
bool jobs_apply(struct pkg_jobs *jobs, PkBackend *backend, PkErrorEnum jobs_failed);
bool jobs_set_repo(struct pkg_jobs *jobs, const char *reponame);
-char **jobs_add_package_ids(struct pkg_jobs *jobs, gchar **package_ids, guint count);
+char **jobs_add_package_ids(struct pkg_jobs *jobs, gchar **package_ids, guint count);
struct pkg_jobs *jobs_allocate(pkg_jobs_t type, struct pkgdb *db);
void jobs_emit_packages(struct pkg_jobs *jobs, PkBackend *backend, pkg_info_ptr info);
-void jobs_free(struct pkg_jobs **jobs_p);
+void jobs_free (struct pkg_jobs **jobs_p);
#endif /* !_PKGNG_BACKEND_JOBS_CORE_H_ */
Modified: soc2013/mattbw/backend/jobs/do.c
==============================================================================
--- soc2013/mattbw/backend/jobs/do.c Sun Sep 8 11:06:21 2013 (r257114)
+++ soc2013/mattbw/backend/jobs/do.c Sun Sep 8 11:08:34 2013 (r257115)
@@ -34,14 +34,14 @@
#include "core.h" /* jobs_... */
#include "do.h" /* jobs_do_... */
-static bool jobs_do_apply(const struct jobs_spec *spec, struct pkg_jobs *jobs);
-static bool jobs_do_check(const struct jobs_spec *spec, struct pkg_jobs *jobs, gchar **package_ids, guint count);
-static bool jobs_do_count(const struct jobs_spec *spec, struct pkg_jobs *jobs);
-static bool jobs_do_multiple_repos(struct pkgdb *db, const struct jobs_spec *spec, gchar **package_ids, guint count);
-static bool jobs_do_same_repo(struct pkgdb *db, const struct jobs_spec *spec, gchar **package_ids, guint count, const char *reponame);
-static bool jobs_do_set_repo(const struct jobs_spec *spec, struct pkg_jobs *jobs, const char *reponame);
-static bool jobs_do_solve(const struct jobs_spec *spec, struct pkg_jobs *jobs);
-static char **jobs_do_populate(const struct jobs_spec *spec, struct pkg_jobs *jobs, gchar **package_ids, guint count);
+static bool jobs_do_apply(const struct jobs_spec *spec, struct pkg_jobs *jobs);
+static bool jobs_do_check(const struct jobs_spec *spec, struct pkg_jobs *jobs, gchar **package_ids, guint count);
+static bool jobs_do_count(const struct jobs_spec *spec, struct pkg_jobs *jobs);
+static bool jobs_do_multiple_repos(struct pkgdb *db, const struct jobs_spec *spec, gchar **package_ids, guint count);
+static bool jobs_do_same_repo(struct pkgdb *db, const struct jobs_spec *spec, gchar **package_ids, guint count, const char *reponame);
+static bool jobs_do_set_repo(const struct jobs_spec *spec, struct pkg_jobs *jobs, const char *reponame);
+static bool jobs_do_solve(const struct jobs_spec *spec, struct pkg_jobs *jobs);
+static char **jobs_do_populate(const struct jobs_spec *spec, struct pkg_jobs *jobs, gchar **package_ids, guint count);
static struct pkg_jobs *jobs_do_allocate(const struct jobs_spec *spec, struct pkgdb *db);
static struct pkg_jobs *jobs_do_initialise(const struct jobs_spec *spec, struct pkgdb *db, const char *reponame);
@@ -62,7 +62,7 @@
if (db != NULL) {
if (spec->use_package_ids) {
guint count;
- gchar **package_ids;
+ gchar **package_ids;
package_ids = get_package_ids(spec->backend, &count);
assert(package_ids != NULL);
@@ -75,7 +75,6 @@
pkgdb_close(db);
}
-
return success;
}
@@ -118,8 +117,8 @@
count, spec->reject_non_updates);
}
if (failed_package != NULL) {
- char *message;
- char *package_id;
+ char *message;
+ char *package_id;
package_id = pkgutils_pkg_to_id(failed_package);
message = NULL;
@@ -133,7 +132,6 @@
g_free(package_id);
free(message);
}
-
assert(0 < count || failed_package == NULL);
return (failed_package == NULL);
@@ -151,7 +149,6 @@
if (count == 0) {
ERR(spec->backend, spec->no_jobs_error, "nothing to do");
}
-
return (0 < count);
}
@@ -164,16 +161,16 @@
{
bool success;
unsigned int i;
- char *repo;
- gchar **splits;
+ char *repo;
+ gchar **splits;
- /*
+ /*
* HACK ALERT
- *
- * We'd ideally like to do one job for all PackageIDs but, because
- * there could be more than one repo being used (as each PackageID has
- * its own repo), we need to do one job per PackageID.
- * TODO: consider bundling PackageIDs up into separate jobs per repo?
+ *
+ * We'd ideally like to do one job for all PackageIDs but, because there
+ * could be more than one repo being used (as each PackageID has its
+ * own repo), we need to do one job per PackageID. TODO: consider
+ * bundling PackageIDs up into separate jobs per repo?
*/
success = true;
for (i = 0; i < count; i++) {
@@ -221,7 +218,7 @@
bool populated;
bool solved;
bool valid;
- char **namevers;
+ char **namevers;
solved = has_actions = valid = false;
@@ -240,11 +237,9 @@
if (populated && solved && has_actions && valid) {
success = jobs_do_apply(spec, jobs);
}
-
pkg_jobs_free(jobs);
namever_array_free(&namevers, count);
}
-
return success;
}
@@ -260,17 +255,16 @@
success = jobs_set_repo(jobs, reponame);
if (!success) {
- char *err_message;
+ char *err_message;
(void)asprintf(&err_message,
"Could not set job repository to '%s'.",
reponame);
- ERR(spec->backend,
+ ERR(spec->backend,
PK_ERROR_ENUM_REPO_NOT_FOUND,
err_message);
- free(err_message);
+ free(err_message);
}
-
return success;
}
@@ -288,15 +282,14 @@
PK_ERROR_ENUM_DEP_RESOLUTION_FAILED,
"could not solve the job");
}
-
return solved;
}
-static char **
+static char **
jobs_do_populate(const struct jobs_spec *spec, struct pkg_jobs *jobs,
gchar **package_ids, guint count)
{
- char **namevers;
+ char **namevers;
assert(spec != NULL);
assert(jobs != NULL);
@@ -314,7 +307,6 @@
"could not find all requested packages");
}
}
-
assert(count >= 1 || namevers == NULL);
return namevers;
@@ -334,7 +326,6 @@
PK_ERROR_ENUM_INTERNAL_ERROR,
"could not init pkg_jobs");
}
-
return jobs;
}
@@ -357,6 +348,5 @@
jobs_free(&jobs);
}
}
-
return jobs;
}
Modified: soc2013/mattbw/backend/jobs/do.h
==============================================================================
--- soc2013/mattbw/backend/jobs/do.h Sun Sep 8 11:06:21 2013 (r257114)
+++ soc2013/mattbw/backend/jobs/do.h Sun Sep 8 11:08:34 2013 (r257115)
@@ -36,9 +36,9 @@
bool reject_non_updates;
bool simulate;
bool use_package_ids;
- bool ignore; /* Alignment */
+ bool ignore; /* Alignment */
};
-bool jobs_do(const struct jobs_spec *spec);
+bool jobs_do (const struct jobs_spec *spec);
#endif /* !_PKGNG_BACKEND_JOBS_DO_H */
More information about the svn-soc-all
mailing list