From 9a74754c4a1e4462b1054d705cf95ace3133a2b2 Mon Sep 17 00:00:00 2001 From: James Bowes Date: Sat, 17 May 2008 17:25:14 -0400 Subject: [PATCH] Convert leading whitespace to tabs --- Makefile.am | 9 +++-- src/low-config.h | 10 +++--- src/low-package-rpmdb.c | 4 +-- src/low-package-rpmdb.h | 6 ++-- src/low-package-sqlite.h | 6 ++-- src/low-package.h | 22 ++++++------ src/low-repo-rpmdb.c | 17 ++++----- src/low-repo-rpmdb.h | 18 +++++----- src/low-repo-set.h | 2 +- src/low-repo-sqlite.c | 32 +++++++++-------- src/low-repo-sqlite.h | 10 +++--- src/low-repo.h | 6 ++-- src/main.c | 75 ++++++++++++++++++++-------------------- 13 files changed, 113 insertions(+), 104 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4be4994..b8c0b11 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,16 +31,21 @@ tablint: @! find \( -name \*.c -o -name '*.h' -o -name 'Makefile.am' \) \ | xargs grep -nP "^\s* \t" +# Check for all spaces before characters +leadingspacelint: + @! find \( -name \*.c -o -name '*.h' -o -name 'Makefile.am' \) \ + | xargs grep -nP "^ *\w" + # Check for trailing whitespace trailinglint: @! find \( -name \*.c -o -name '*.h' -o -name 'Makefile.am' \) \ | xargs grep -nP "[ \t]$$" -whitespacelint: tablint trailinglint +whitespacelint: tablint trailinglint leadingspacelint # XXX watch for pointers and custom typedefs with this indent: - @! find \( -name \*.c -o -name '*.h' -o -name 'Makefile.am' \) \ + @! find \( -name \*.c -o -name '*.h' \) \ | xargs indent -linux -pcs -psl .PHONY: doxygen diff --git a/src/low-config.h b/src/low-config.h index 19a6956..38d141f 100644 --- a/src/low-config.h +++ b/src/low-config.h @@ -25,7 +25,7 @@ #define _LOW_CONFIG_H_ typedef struct _LowConfig { - GKeyFile *config; + GKeyFile *config; } LowConfig; LowConfig * low_config_initialize (void); @@ -34,10 +34,10 @@ void low_config_free (LowConfig *config); char ** low_config_get_repo_names (LowConfig *config); char * low_config_get_string (LowConfig *config, - const char *group, - const char *key); + const char *group, + const char *key); gboolean low_config_get_boolean (LowConfig *config, - const char *group, - const char *key); + const char *group, + const char *key); #endif /* _LOW_CONFIG_H_ */ diff --git a/src/low-package-rpmdb.c b/src/low-package-rpmdb.c index cbf3fdc..4d8c17c 100644 --- a/src/low-package-rpmdb.c +++ b/src/low-package-rpmdb.c @@ -34,8 +34,8 @@ union rpm_entry { static LowPackage * low_package_rpmdb_new_from_header (Header header) { - union rpm_entry name, epoch, version, release, arch; - union rpm_entry size, summary, description, url, license; + union rpm_entry name, epoch, version, release, arch; + union rpm_entry size, summary, description, url, license; int_32 type, count; headerGetEntry(header, RPMTAG_NAME, &type, &name.p, &count); diff --git a/src/low-package-rpmdb.h b/src/low-package-rpmdb.h index 7e83549..03267a3 100644 --- a/src/low-package-rpmdb.h +++ b/src/low-package-rpmdb.h @@ -27,12 +27,12 @@ #define _LOW_PACKAGE_RPMDB_H_ typedef struct _LowPackageRpmdb { - LowPackage pkg; + LowPackage pkg; } LowPackageRpmdb; typedef struct _LowPackageIterRpmdb { - LowPackageIter super; - rpmdbMatchIterator rpm_iter; + LowPackageIter super; + rpmdbMatchIterator rpm_iter; } LowPackageIterRpmdb; LowPackageIter * low_package_iter_next (LowPackageIter *iter); diff --git a/src/low-package-sqlite.h b/src/low-package-sqlite.h index 097eb5a..46dd7bf 100644 --- a/src/low-package-sqlite.h +++ b/src/low-package-sqlite.h @@ -26,12 +26,12 @@ #define _LOW_PACKAGE_SQLITE_H_ typedef struct _LowPackageSqlite { - LowPackage pkg; + LowPackage pkg; } LowPackageSqlite; typedef struct _LowPackageIterSqlite { - LowPackageIter super; - sqlite3_stmt *pp_stmt; + LowPackageIter super; + sqlite3_stmt *pp_stmt; } LowPackageIterSqlite; LowPackageIter * low_sqlite_package_iter_next (LowPackageIter *iter); diff --git a/src/low-package.h b/src/low-package.h index 529d224..952d95c 100644 --- a/src/low-package.h +++ b/src/low-package.h @@ -25,18 +25,18 @@ #define _LOW_PACKAGE_H_ typedef struct _LowPackage { - const char *name; - const char *version; - const char *release; - const char *arch; - const char *epoch; + const char *name; + const char *version; + const char *release; + const char *arch; + const char *epoch; - size_t size; - const char *repo; - const char *summary; - const char *description; - const char *url; - const char *license; + size_t size; + const char *repo; + const char *summary; + const char *description; + const char *url; + const char *license; } LowPackage; typedef struct _LowPackageIter { diff --git a/src/low-repo-rpmdb.c b/src/low-repo-rpmdb.c index 54737ab..770c549 100644 --- a/src/low-repo-rpmdb.c +++ b/src/low-repo-rpmdb.c @@ -77,7 +77,8 @@ low_repo_rpmdb_list_by_name (LowRepo *repo, const char *name) iter->super.repo = repo; iter->super.pkg = NULL; - iter->rpm_iter = rpmdbInitIterator (repo_rpmdb->db, RPMTAG_NAME, name, 0); + iter->rpm_iter = rpmdbInitIterator (repo_rpmdb->db, RPMTAG_NAME, name, + 0); return (LowPackageIter *) iter; } @@ -90,19 +91,19 @@ low_repo_rpmdb_search_provides (LowRepo *repo, const char *provides) iter->super.pkg = NULL; iter->rpm_iter = rpmdbInitIterator (repo_rpmdb->db, RPMTAG_PROVIDENAME, - provides, 0); + provides, 0); return (LowPackageIter *) iter; } LowPackageIter * low_repo_rpmdb_search_requires (LowRepo *repo, const char *requires) { - LowRepoRpmdb *repo_rpmdb = (LowRepoRpmdb *) repo; - LowPackageIterRpmdb *iter = malloc (sizeof (LowPackageIterRpmdb)); - iter->super.pkg = NULL; + LowRepoRpmdb *repo_rpmdb = (LowRepoRpmdb *) repo; + LowPackageIterRpmdb *iter = malloc (sizeof (LowPackageIterRpmdb)); + iter->super.pkg = NULL; - iter->rpm_iter = rpmdbInitIterator (repo_rpmdb->db, RPMTAG_REQUIRENAME, - requires, 0); - return (LowPackageIter *) iter; + iter->rpm_iter = rpmdbInitIterator (repo_rpmdb->db, RPMTAG_REQUIRENAME, + requires, 0); + return (LowPackageIter *) iter; } diff --git a/src/low-repo-rpmdb.h b/src/low-repo-rpmdb.h index 4c796ef..d5cc0e5 100644 --- a/src/low-repo-rpmdb.h +++ b/src/low-repo-rpmdb.h @@ -26,15 +26,15 @@ #ifndef _LOW_REPO_RPMDB_H_ #define _LOW_REPO_RPMDB_H_ -LowRepo * low_repo_rpmdb_initialize (void); -void low_repo_rpmdb_shutdown (LowRepo *repo); +LowRepo * low_repo_rpmdb_initialize (void); +void low_repo_rpmdb_shutdown (LowRepo *repo); -LowPackageIter * low_repo_rpmdb_list_all (LowRepo *repo); -LowPackageIter * low_repo_rpmdb_list_by_name (LowRepo *repo, - const char *name); -LowPackageIter * low_repo_rpmdb_search_provides (LowRepo *repo, - const char *provides); -LowPackageIter * low_repo_rpmdb_search_requires (LowRepo *repo, - const char *requires); +LowPackageIter * low_repo_rpmdb_list_all (LowRepo *repo); +LowPackageIter * low_repo_rpmdb_list_by_name (LowRepo *repo, + const char *name); +LowPackageIter * low_repo_rpmdb_search_provides (LowRepo *repo, + const char *provides); +LowPackageIter * low_repo_rpmdb_search_requires (LowRepo *repo, + const char *requires); #endif /* _LOW_REPO_RPMDB_H_ */ diff --git a/src/low-repo-set.h b/src/low-repo-set.h index 25ad778..6cbc1a2 100644 --- a/src/low-repo-set.h +++ b/src/low-repo-set.h @@ -27,7 +27,7 @@ #define _LOW_REPO_SET_H_ typedef struct _LowRepoSet { - GHashTable *repos; + GHashTable *repos; } LowRepoSet; typedef enum { diff --git a/src/low-repo-sqlite.c b/src/low-repo-sqlite.c index 7327599..b428167 100644 --- a/src/low-repo-sqlite.c +++ b/src/low-repo-sqlite.c @@ -76,8 +76,9 @@ LowPackageIter * low_repo_sqlite_list_by_name (LowRepo *repo, const char *name) { const char *stmt = "SELECT name, arch, version, release, size_package, " - "summary, description, url, rpm_license FROM packages " - "WHERE name = :name"; + "summary, description, url, rpm_license " + "FROM packages " + "WHERE name = :name"; LowRepoSqlite *repo_sqlite = (LowRepoSqlite *) repo; LowPackageIterSqlite *iter = malloc (sizeof (LowPackageIterSqlite)); iter->super.repo = repo; @@ -92,9 +93,9 @@ LowPackageIter * low_repo_sqlite_search_provides (LowRepo *repo, const char *provides) { const char *stmt = "SELECT p.name, p.arch, p.version, p.release, " - "p.size_package, p.summary, p.description, p.url, " - "p.rpm_license FROM packages p, provides pr " - "WHERE pr.pkgKey = p.pkgKey AND pr.name = :provides"; + "p.size_package, p.summary, p.description, p.url, " + "p.rpm_license FROM packages p, provides pr " + "WHERE pr.pkgKey = p.pkgKey AND pr.name = :provides"; LowRepoSqlite *repo_sqlite = (LowRepoSqlite *) repo; LowPackageIterSqlite *iter = malloc (sizeof (LowPackageIterSqlite)); iter->super.repo = repo; @@ -108,17 +109,18 @@ low_repo_sqlite_search_provides (LowRepo *repo, const char *provides) LowPackageIter * low_repo_sqlite_search_requires (LowRepo *repo, const char *requires) { - const char *stmt = "SELECT p.name, p.arch, p.version, p.release, " - "p.size_package, p.summary, p.description, p.url, " - "p.rpm_license FROM packages p, requires req " - "WHERE req.pkgKey = p.pkgKey AND req.name = :requires"; - LowRepoSqlite *repo_sqlite = (LowRepoSqlite *) repo; - LowPackageIterSqlite *iter = malloc (sizeof (LowPackageIterSqlite)); + const char *stmt = "SELECT p.name, p.arch, p.version, p.release, " + "p.size_package, p.summary, p.description, p.url, " + "p.rpm_license FROM packages p, requires req " + "WHERE req.pkgKey = p.pkgKey " + "AND req.name = :requires"; + LowRepoSqlite *repo_sqlite = (LowRepoSqlite *) repo; + LowPackageIterSqlite *iter = malloc (sizeof (LowPackageIterSqlite)); iter->super.repo = repo; - iter->super.pkg = NULL; + iter->super.pkg = NULL; - sqlite3_prepare (repo_sqlite->db, stmt, -1, &iter->pp_stmt, NULL); - sqlite3_bind_text (iter->pp_stmt, 1, requires, -1, SQLITE_STATIC); - return (LowPackageIter *) iter; + sqlite3_prepare (repo_sqlite->db, stmt, -1, &iter->pp_stmt, NULL); + sqlite3_bind_text (iter->pp_stmt, 1, requires, -1, SQLITE_STATIC); + return (LowPackageIter *) iter; } diff --git a/src/low-repo-sqlite.h b/src/low-repo-sqlite.h index 5887d92..efb6160 100644 --- a/src/low-repo-sqlite.h +++ b/src/low-repo-sqlite.h @@ -26,17 +26,17 @@ #define _LOW_REPO_SQLITE_H_ LowRepo * low_repo_sqlite_initialize (const char *id, - const char *name, - gboolean enabled); + const char *name, + gboolean enabled); void low_repo_sqlite_shutdown (LowRepo *repo); LowPackageIter * low_repo_sqlite_list_all (LowRepo *repo); LowPackageIter * low_repo_sqlite_list_by_name (LowRepo *repo, - const char *name); + const char *name); LowPackageIter * low_repo_sqlite_search_provides (LowRepo *repo, - const char *provides); + const char *provides); LowPackageIter * low_repo_sqlite_search_requires (LowRepo *repo, - const char *requires); + const char *requires); #endif /* _LOW_REPO_SQLITE_H_ */ diff --git a/src/low-repo.h b/src/low-repo.h index 4aed86f..88f305e 100644 --- a/src/low-repo.h +++ b/src/low-repo.h @@ -25,9 +25,9 @@ #define _LOW_REPO_H_ typedef struct _LowRepo { - char * id; - char * name; - gboolean enabled; + char * id; + char * name; + gboolean enabled; } LowRepo; #endif /* _LOW_REPO_H__ */ diff --git a/src/main.c b/src/main.c index 6eb7b2f..04ae2c6 100644 --- a/src/main.c +++ b/src/main.c @@ -84,8 +84,7 @@ command_info (int argc, const char *argv[]) low_repo_rpmdb_shutdown (repo); repos = low_repo_set_initialize_from_config (config); - low_repo_set_for_each (repos, ENABLED, (LowRepoSetFunc) info, - name); + low_repo_set_for_each (repos, ENABLED, (LowRepoSetFunc) info, name); low_repo_set_free (repos); low_config_free (config); free (name); @@ -97,7 +96,7 @@ static void print_package_short (LowPackage *pkg) { printf ("%s.%s %s-%s %s\n", pkg->name, pkg->arch, - pkg->version, pkg->release, pkg->repo); + pkg->version, pkg->release, pkg->repo); } static int @@ -118,7 +117,8 @@ command_list (int argc, const char *argv[]) if (!strcmp(argv[0], "all")) { repo = low_repo_sqlite_initialize ("fedora", "fedora", TRUE); iter = low_repo_sqlite_list_all (repo); - while (iter = low_sqlite_package_iter_next (iter), iter != NULL) { + while (iter = low_sqlite_package_iter_next (iter), + iter != NULL) { LowPackage *pkg = iter->pkg; print_package_short (pkg); } @@ -135,7 +135,7 @@ static void print_repo (LowRepo *repo) { printf (FORMAT_STRING, repo->id, repo->name, - repo->enabled ? "enabled" : "disabled"); + repo->enabled ? "enabled" : "disabled"); } static int @@ -166,7 +166,8 @@ command_repolist (int argc, const char *argv[]) low_repo_rpmdb_shutdown (rpmdb); repos = low_repo_set_initialize_from_config (config); - low_repo_set_for_each (repos, filter, (LowRepoSetFunc) print_repo, NULL); + low_repo_set_for_each (repos, filter, (LowRepoSetFunc) print_repo, + NULL); low_repo_set_free (repos); low_config_free (config); @@ -190,14 +191,14 @@ search_provides (LowRepo *repo, gpointer data) static void search_requires (LowRepo *repo, gpointer data) { - LowPackageIter *iter; - char *requires = (char *) data; + LowPackageIter *iter; + char *requires = (char *) data; - iter = low_repo_sqlite_search_requires (repo, requires); - while (iter = low_sqlite_package_iter_next (iter), iter != NULL) { + iter = low_repo_sqlite_search_requires (repo, requires); + while (iter = low_sqlite_package_iter_next (iter), iter != NULL) { LowPackage *pkg = iter->pkg; print_package_short (pkg); - } + } } @@ -233,30 +234,30 @@ command_whatprovides (int argc, const char *argv[]) static int command_whatrequires (int argc, const char *argv[]) { - LowRepo *rpmdb; - LowRepoSet *repos; - LowConfig *config = low_config_initialize (); - LowPackageIter *iter; - gchar *requires = g_strdup (argv[0]); - - rpmdb = low_repo_rpmdb_initialize (); - iter = low_repo_rpmdb_search_requires (rpmdb, requires); - - while (iter = low_package_iter_next (iter), iter != NULL) { - LowPackage *pkg = iter->pkg; - print_package_short (pkg); - } - low_repo_rpmdb_shutdown (rpmdb); - - repos = low_repo_set_initialize_from_config (config); - low_repo_set_for_each (repos, ENABLED, (LowRepoSetFunc) search_requires, - requires); - - low_repo_set_free (repos); - low_config_free (config); - g_free (requires); - - return 0; + LowRepo *rpmdb; + LowRepoSet *repos; + LowConfig *config = low_config_initialize (); + LowPackageIter *iter; + gchar *requires = g_strdup (argv[0]); + + rpmdb = low_repo_rpmdb_initialize (); + iter = low_repo_rpmdb_search_requires (rpmdb, requires); + + while (iter = low_package_iter_next (iter), iter != NULL) { + LowPackage *pkg = iter->pkg; + print_package_short (pkg); + } + low_repo_rpmdb_shutdown (rpmdb); + + repos = low_repo_set_initialize_from_config (config); + low_repo_set_for_each (repos, ENABLED, + (LowRepoSetFunc) search_requires, requires); + + low_repo_set_free (repos); + low_config_free (config); + g_free (requires); + + return 0; } static int @@ -295,8 +296,8 @@ const SubCommand commands[] = { command_repolist }, { "whatprovides", "Find what package provides the given value", command_whatprovides }, - { "whatrequires", "Find what package requires the given value", - command_whatrequires }, + { "whatrequires", "Find what package requires the given value", + command_whatrequires }, { "version", "Display version information", command_version }, { "help", "Display a helpful usage message", command_help } };