Skip to content
This repository has been archived by the owner on Aug 15, 2021. It is now read-only.

Commit

Permalink
Convert leading whitespace to tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
James Bowes committed May 17, 2008
1 parent 691cb31 commit 9a74754
Show file tree
Hide file tree
Showing 13 changed files with 113 additions and 104 deletions.
9 changes: 7 additions & 2 deletions Makefile.am
View file
Expand Up @@ -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
10 changes: 5 additions & 5 deletions src/low-config.h
View file
Expand Up @@ -25,7 +25,7 @@
#define _LOW_CONFIG_H_

typedef struct _LowConfig {
GKeyFile *config;
GKeyFile *config;
} LowConfig;

LowConfig * low_config_initialize (void);
Expand All @@ -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_ */
4 changes: 2 additions & 2 deletions src/low-package-rpmdb.c
View file
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/low-package-rpmdb.h
View file
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/low-package-sqlite.h
View file
Expand Up @@ -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);
Expand Down
22 changes: 11 additions & 11 deletions src/low-package.h
View file
Expand Up @@ -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 {
Expand Down
17 changes: 9 additions & 8 deletions src/low-repo-rpmdb.c
View file
Expand Up @@ -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;
}

Expand All @@ -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;
}

18 changes: 9 additions & 9 deletions src/low-repo-rpmdb.h
View file
Expand Up @@ -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_ */
2 changes: 1 addition & 1 deletion src/low-repo-set.h
View file
Expand Up @@ -27,7 +27,7 @@
#define _LOW_REPO_SET_H_

typedef struct _LowRepoSet {
GHashTable *repos;
GHashTable *repos;
} LowRepoSet;

typedef enum {
Expand Down
32 changes: 17 additions & 15 deletions src/low-repo-sqlite.c
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}

10 changes: 5 additions & 5 deletions src/low-repo-sqlite.h
View file
Expand Up @@ -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_ */
6 changes: 3 additions & 3 deletions src/low-repo.h
View file
Expand Up @@ -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__ */

0 comments on commit 9a74754

Please sign in to comment.