Date: Sun, 8 Sep 2013 11:06:21 GMT From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r257114 - soc2013/mattbw/backend/query Message-ID: <201309081106.r88B6LdU002030@socsvn.freebsd.org>
index | next in thread | raw e-mail
Author: mattbw Date: Sun Sep 8 11:06:21 2013 New Revision: 257114 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257114 Log: Indent the query files too. Modified: soc2013/mattbw/backend/query/check_test.c soc2013/mattbw/backend/query/depends.c soc2013/mattbw/backend/query/depends.h soc2013/mattbw/backend/query/do.c soc2013/mattbw/backend/query/do.h soc2013/mattbw/backend/query/find.c soc2013/mattbw/backend/query/id.c soc2013/mattbw/backend/query/id.h soc2013/mattbw/backend/query/id_test.c soc2013/mattbw/backend/query/match.c soc2013/mattbw/backend/query/packages.c Modified: soc2013/mattbw/backend/query/check_test.c ============================================================================== --- soc2013/mattbw/backend/query/check_test.c Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/check_test.c Sun Sep 8 11:06:21 2013 (r257114) @@ -38,7 +38,7 @@ ATF_TC_BODY(package_match_name_only, tc) { struct pkg *pkg; - struct query_id id; + struct query_id id; pkg = gen_pkg(PKG_REMOTE); ATF_REQUIRE(pkg != NULL); @@ -63,7 +63,7 @@ ATF_TC_BODY(package_match_namever_only, tc) { struct pkg *pkg; - struct query_id id; + struct query_id id; pkg = gen_pkg(PKG_REMOTE); ATF_REQUIRE(pkg != NULL); @@ -88,7 +88,7 @@ ATF_TC_BODY(package_match_full, tc) { struct pkg *pkg; - struct query_id id; + struct query_id id; pkg = gen_pkg(PKG_REMOTE); ATF_REQUIRE(pkg != NULL); @@ -123,7 +123,7 @@ ATF_TC_BODY(package_match_bad_namever, tc) { struct pkg *pkg; - struct query_id id; + struct query_id id; pkg = gen_pkg(PKG_REMOTE); ATF_REQUIRE(pkg != NULL); @@ -150,7 +150,7 @@ ATF_TC_BODY(package_match_bad_arch, tc) { struct pkg *pkg; - struct query_id id; + struct query_id id; pkg = gen_pkg(PKG_REMOTE); ATF_REQUIRE(pkg != NULL); @@ -177,7 +177,7 @@ ATF_TC_BODY(package_match_bad_repo, tc) { struct pkg *pkg; - struct query_id id; + struct query_id id; pkg = gen_pkg(PKG_REMOTE); ATF_REQUIRE(pkg != NULL); @@ -204,7 +204,7 @@ ATF_TC_BODY(package_match_full_installed, tc) { struct pkg *pkg; - struct query_id id; + struct query_id id; pkg = gen_pkg(PKG_INSTALLED); ATF_REQUIRE(pkg != NULL); @@ -229,31 +229,23 @@ * This test condition is commented out because it triggers an assertion * failure instead of failing normally. */ -/*ATF_TC(package_match_no_namever); -ATF_TC_HEAD(package_match_no_namever, tc) -{ - - atf_tc_set_md_var(tc, "descr", - "Ensure packages fail to match IDs with a missing namever."); -} -ATF_TC_BODY(package_match_no_namever, tc) -{ - struct pkg *pkg; - struct query_id id; - - pkg = gen_pkg(PKG_REMOTE); - ATF_REQUIRE(pkg != NULL); - - id.namever = NULL; - id.arch = strdup("freebsd:10:x86:32"); - id.repo = strdup("arch"); - - ATF_CHECK(!query_check_package(pkg, &id)); - - pkg_free(pkg); - free(id.arch); - free(id.repo); -}*/ +/* + * ATF_TC(package_match_no_namever); ATF_TC_HEAD(package_match_no_namever, + * tc) { + * + * atf_tc_set_md_var(tc, "descr", "Ensure packages fail to match IDs with a + * missing namever."); } ATF_TC_BODY(package_match_no_namever, tc) { struct + * pkg *pkg; struct query_id id; + * + * pkg = gen_pkg(PKG_REMOTE); ATF_REQUIRE(pkg != NULL); + * + * id.namever = NULL; id.arch = strdup("freebsd:10:x86:32"); id.repo = + * strdup("arch"); + * + * ATF_CHECK(!query_check_package(pkg, &id)); + * + * pkg_free(pkg); free(id.arch); free(id.repo); } + */ /* @@ -269,7 +261,7 @@ ATF_TP_ADD_TC(tp, package_match_bad_arch); ATF_TP_ADD_TC(tp, package_match_bad_repo); ATF_TP_ADD_TC(tp, package_match_full_installed); - /*ATF_TP_ADD_TC(tp, package_match_no_namever);*/ + /* ATF_TP_ADD_TC(tp, package_match_no_namever); */ return atf_no_error(); } Modified: soc2013/mattbw/backend/query/depends.c ============================================================================== --- soc2013/mattbw/backend/query/depends.c Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/depends.c Sun Sep 8 11:06:21 2013 (r257114) @@ -30,10 +30,10 @@ #include "id.h" /* query_id, query_id_... */ #include "match.h" /* query_match_... */ -static bool emit_dependency(struct pkg_dep *dep, PkBackend *backend, struct pkgdb *db, unsigned int load_flags); -static bool emit_found_dependency(PkBackend *backend, struct pkg *package); -static bool emit_missing_dependency(PkBackend *backend, gchar *package_id); -static gchar *dep_to_package_id(struct pkg_dep *dep); +static bool emit_dependency(struct pkg_dep *dep, PkBackend *backend, struct pkgdb *db, unsigned int load_flags); +static bool emit_found_dependency(PkBackend *backend, struct pkg *package); +static bool emit_missing_dependency(PkBackend *backend, gchar *package_id); +static gchar *dep_to_package_id(struct pkg_dep *dep); static struct pkg *id_to_package(gchar *package_id, struct pkgdb *db, unsigned int load_flags); bool @@ -65,14 +65,13 @@ unsigned int load_flags) { bool success; - gchar *package_id; + gchar *package_id; struct pkg *package; package_id = dep_to_package_id(dep); /* - * Does this dependency correspond to a package in our - * database? + * Does this dependency correspond to a package in our database? */ package = id_to_package(package_id, db, load_flags); @@ -112,7 +111,7 @@ id_to_package(gchar *package_id, struct pkgdb *db, unsigned int load_flags) { struct pkg *package; - struct query_id query_id; + struct query_id query_id; assert(package_id != NULL); assert(db != NULL); @@ -120,23 +119,22 @@ package = NULL; if (package_id != NULL) { - bool success; + bool success; success = query_id_from_package_id(package_id, &query_id); if (success) { package = query_match_id(&query_id, db, load_flags); } } - return package; } /* * Converts a pkg_dep into a (partial) package ID. - * + * * The result may be NULL and should be freed using g_free. */ -static gchar * +static gchar * dep_to_package_id(struct pkg_dep *dep) { const char *name; @@ -149,4 +147,3 @@ return pk_package_id_build(name, version, "", ""); } - Modified: soc2013/mattbw/backend/query/depends.h ============================================================================== --- soc2013/mattbw/backend/query/depends.h Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/depends.h Sun Sep 8 11:06:21 2013 (r257114) @@ -25,9 +25,8 @@ #include "../pk-backend.h" /* Pk... */ -typedef int (*depends_get_ptr) (const struct pkg *pkg, struct pkg_dep **dep); +typedef int (*depends_get_ptr) (const struct pkg *pkg, struct pkg_dep **dep); bool query_depends_emit(PkBackend *backend, struct pkg *pkg, depends_get_ptr get, struct pkgdb *db, unsigned int load_flags); -#endif /*_PKGNG_BACKEND_QUERY_DEPENDS_H_*/ - +#endif /* _PKGNG_BACKEND_QUERY_DEPENDS_H_ */ Modified: soc2013/mattbw/backend/query/do.c ============================================================================== --- soc2013/mattbw/backend/query/do.c Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/do.c Sun Sep 8 11:06:21 2013 (r257114) @@ -31,16 +31,16 @@ #include "match.h" /* query_match_... */ #include "packages.h" /* query_packages_... */ -typedef struct query_id * (*query_id_func_ptr) (gchar **strings, guint count); +typedef struct query_id *(*query_id_func_ptr) (gchar **strings, guint count); -static bool emit_packages(PkBackend *backend, struct pkgdb *db, emit_ptr emitter, struct pkg **packages, unsigned int count); -static bool query_do_from_backend(PkBackend *backend, unsigned int load_flags, emit_ptr emitter, query_id_func_ptr to_query_ids); -static bool query_with_db(struct pkgdb *db, PkBackend *backend, unsigned int load_flags, emit_ptr emitter, query_id_func_ptr to_query_ids); +static bool emit_packages(PkBackend *backend, struct pkgdb *db, emit_ptr emitter, struct pkg **packages, unsigned int count); +static bool query_do_from_backend(PkBackend *backend, unsigned int load_flags, emit_ptr emitter, query_id_func_ptr to_query_ids); +static bool query_with_db(struct pkgdb *db, PkBackend *backend, unsigned int load_flags, emit_ptr emitter, query_id_func_ptr to_query_ids); /* * Runs a query over the PackageIDs selected in the backend that sends the * first match to an emitting function. - * + * * This is a wrapper over several lower level query functions. */ bool @@ -59,7 +59,7 @@ /* * Runs a query over the package names selected in the backend that sends the * first match to an emitting function. - * + * * This is a wrapper over several lower level query functions. */ bool @@ -120,12 +120,10 @@ if (query_ids != NULL) { packages = query_match_ids(query_ids, count, db, load_flags); } - if (packages != NULL) { success = emit_packages(backend, db, emitter, packages, count); query_packages_array_free(&packages, count); } - query_id_array_free(&query_ids, count); return success; Modified: soc2013/mattbw/backend/query/do.h ============================================================================== --- soc2013/mattbw/backend/query/do.h Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/do.h Sun Sep 8 11:06:21 2013 (r257114) @@ -24,7 +24,7 @@ #include <stdbool.h> #include "../pk-backend.h" -typedef bool (*emit_ptr) (PkBackend *backend, struct pkgdb *db, struct pkg *pkg); +typedef bool (*emit_ptr) (PkBackend *backend, struct pkgdb *db, struct pkg *pkg); bool query_do_from_backend_ids(PkBackend *backend, unsigned int load_flags, emit_ptr emitter); bool query_do_from_backend_names(PkBackend *backend, unsigned int load_flags, emit_ptr emitter); Modified: soc2013/mattbw/backend/query/find.c ============================================================================== --- soc2013/mattbw/backend/query/find.c Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/find.c Sun Sep 8 11:06:21 2013 (r257114) @@ -28,7 +28,7 @@ #include "find.h" /* query_find_... */ #include "id.h" /* struct query_id */ -static bool can_remote_iterate(struct query_id *query_id, unsigned int load_flags); +static bool can_remote_iterate(struct query_id *query_id, unsigned int load_flags); struct pkgdb_it * query_find_local(struct query_id *query_id, struct pkgdb *db, @@ -60,7 +60,6 @@ pkgdb_it_free(iterator); iterator = NULL; } - return iterator; } Modified: soc2013/mattbw/backend/query/id.c ============================================================================== --- soc2013/mattbw/backend/query/id.c Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/id.c Sun Sep 8 11:06:21 2013 (r257114) @@ -27,7 +27,7 @@ #include "../namever.h" /* namever_... */ -typedef bool (*id_from_string_ptr) (const char *, struct query_id *); +typedef bool (*id_from_string_ptr) (const char *, struct query_id *); static char *strdup_null_if_empty(const char *in); static struct query_id *query_id_array_alloc(unsigned int count); @@ -84,13 +84,12 @@ query_id_array_free(&query_ids, package_count); } } - return query_ids; } /* - * Converts a package name or name-version string to a query ID. - * Overwrites the contents of *query_id with said ID. + * Converts a package name or name-version string to a query ID. Overwrites + * the contents of *query_id with said ID. */ bool query_id_from_name(const char *name, struct query_id *query_id) @@ -107,14 +106,14 @@ } /* - * Converts a PackageKit package ID to a query ID. - * Overwrites the contents of *query_id with said ID. + * Converts a PackageKit package ID to a query ID. Overwrites the contents of + * *query_id with said ID. */ bool query_id_from_package_id(const gchar *package_id, struct query_id *query_id) { bool success; - gchar **split_package_id; + gchar **split_package_id; assert(package_id != NULL); assert(query_id != NULL); @@ -125,10 +124,10 @@ if (split_package_id != NULL) { bool have_name; bool have_version; - gchar *name; - gchar *version; - gchar *arch; - gchar *repo; + gchar *name; + gchar *version; + gchar *arch; + gchar *repo; /* We're not allowed to have an empty name or version. */ @@ -139,8 +138,8 @@ have_version = (version != NULL && version[0] != '\0'); /* - * Names and versions are mandatory. - * Anything else is optional. + * Names and versions are mandatory. Anything else is + * optional. */ if (have_name && have_version) { query_id->namever = namever_from_name_and_version(name, @@ -154,10 +153,8 @@ success = true; } - g_strfreev(split_package_id); } - return success; } @@ -173,7 +170,7 @@ * Returns NULL if the given string is NULL or empty, and a duplicate of the * string otherwise. */ -static char * +static char * strdup_null_if_empty(const char *in) { @@ -204,7 +201,6 @@ free(*query_ids_p); *query_ids_p = NULL; } - assert(*query_ids_p == NULL); } Modified: soc2013/mattbw/backend/query/id.h ============================================================================== --- soc2013/mattbw/backend/query/id.h Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/id.h Sun Sep 8 11:06:21 2013 (r257114) @@ -26,13 +26,13 @@ #include "pkg.h" struct query_id { - char *namever; - char *arch; - char *repo; + char *namever; + char *arch; + char *repo; }; bool query_id_from_name(const char *name, struct query_id *query_id); -bool query_id_from_package_id(const gchar *package_id, struct query_id *query_id); +bool query_id_from_package_id(const gchar *package_id, struct query_id *query_id); struct query_id *query_id_array_from_names(gchar **package_names, unsigned int package_count); struct query_id *query_id_array_from_package_ids(gchar **package_ids, unsigned int package_count); void query_id_array_free(struct query_id **query_ids_p, unsigned int count); Modified: soc2013/mattbw/backend/query/id_test.c ============================================================================== --- soc2013/mattbw/backend/query/id_test.c Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/id_test.c Sun Sep 8 11:06:21 2013 (r257114) @@ -239,8 +239,8 @@ ATF_TC_BODY(query_id_from_name_multiple_valid, tc) { unsigned int i; - struct query_id *results; - char *valid_names[3]; + struct query_id *results; + char *valid_names[3]; const char *valid_1 = "pkg-1.1.4"; const char *valid_2 = "brasero-1.2"; const char *valid_3 = "PackageKit"; @@ -261,7 +261,6 @@ free(results[i].namever); } } - free(valid_names[0]); free(valid_names[1]); free(valid_names[2]); @@ -276,8 +275,8 @@ } ATF_TC_BODY(query_id_from_name_multiple_empty, tc) { - struct query_id *results; - char *invalid_names[3]; + struct query_id *results; + char *invalid_names[3]; const char *invalid_1 = "pkg-1.1.4"; const char *invalid_2 = ""; const char *invalid_3 = "PackageKit"; @@ -303,8 +302,8 @@ } ATF_TC_BODY(query_id_from_package_id_multiple_valid, tc) { - struct query_id *results; - char *valid_package_ids[3]; + struct query_id *results; + char *valid_package_ids[3]; const char *valid_1 = "pkg;1.1.4;freebsd:9:x86:32;packagesite"; const char *valid_2 = "brasero;1.2;freebsd:9:x86:64;elsewhere"; const char *valid_3 = "PackageKit;0.6;freebsd:10:x86:32;installed"; @@ -329,7 +328,6 @@ ATF_CHECK_STREQ(results[2].arch, "freebsd:10:x86:32"); ATF_CHECK_STREQ(results[2].repo, "installed"); } - free(valid_package_ids[0]); free(valid_package_ids[1]); free(valid_package_ids[2]); Modified: soc2013/mattbw/backend/query/match.c ============================================================================== --- soc2013/mattbw/backend/query/match.c Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/match.c Sun Sep 8 11:06:21 2013 (r257114) @@ -33,12 +33,12 @@ /* Attempts to match a set of QueryIDs into packages. */ -typedef struct pkgdb_it * (*query_func_ptr) (struct query_id *id, struct pkgdb *db, unsigned int load_flags); +typedef struct pkgdb_it *(*query_func_ptr) (struct query_id *id, struct pkgdb *db, unsigned int load_flags); static struct pkg *query_match_from(query_func_ptr function, struct pkgdb *db, struct query_id *query_id, unsigned int load_flags); static struct pkg *match_iterator(struct pkgdb_it *it, struct query_id *query_id, unsigned int load_flags); -struct pkg ** +struct pkg ** query_match_ids(struct query_id *query_ids, unsigned int count, struct pkgdb *db, unsigned int load_flags) { @@ -55,12 +55,11 @@ for (i = 0; i < count; i++) { if (!success) { /* - * Catch both the packages being NULL and any failures - * below. + * Catch both the packages being NULL and any + * failures below. */ break; } - packages[i] = query_match_id(query_ids + i, db, load_flags); success = (packages[i] != NULL); } @@ -68,14 +67,13 @@ if (!success) { query_packages_array_free(&packages, count); } - return packages; } /* * Takes a QueryID and attempts to retrieve its corresponding package. */ -struct pkg * +struct pkg * query_match_id(struct query_id *query_id, struct pkgdb *db, unsigned int load_flags) { bool try_local; @@ -102,7 +100,6 @@ if (package == NULL && try_remote) { package = query_match_from(query_find_remote, db, query_id, load_flags); } - return package; } @@ -125,7 +122,6 @@ result = match_iterator(iterator, query_id, load_flags); pkgdb_it_free(iterator); } - return result; } @@ -157,10 +153,9 @@ pkg_free(pkg); pkg = NULL; } - /* Package if and only if success. */ - assert (pkg != NULL || !success); - assert (pkg == NULL || success); + assert(pkg != NULL || !success); + assert(pkg == NULL || success); return pkg; } Modified: soc2013/mattbw/backend/query/packages.c ============================================================================== --- soc2013/mattbw/backend/query/packages.c Sun Sep 8 11:03:24 2013 (r257113) +++ soc2013/mattbw/backend/query/packages.c Sun Sep 8 11:06:21 2013 (r257114) @@ -25,7 +25,7 @@ #include "packages.h" /* query_packages_... */ /* Allocates an array of size 'package_count' of null pointers to packages. */ -struct pkg ** +struct pkg ** query_packages_array_alloc(unsigned int package_count) {help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309081106.r88B6LdU002030>