summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2014-11-17 21:24:54 -0500
committerDave Reisner <dreisner@archlinux.org>2014-11-17 21:24:54 -0500
commit015dae3c6f100d30e66ad1234f317650f97eb5a0 (patch)
treea76beb4f79a7b6f2df445d8dc213c309cbc01805
parentb4a303bb85b53d6d44b238174297f66b1d21be5a (diff)
downloadexpac-015dae3c6f100d30e66ad1234f317650f97eb5a0.tar.xz
follow site local conventions
-rw-r--r--expac.c20
-rw-r--r--expac.h12
2 files changed, 16 insertions, 16 deletions
diff --git a/expac.c b/expac.c
index 2cf5c5a..548e5d1 100644
--- a/expac.c
+++ b/expac.c
@@ -55,8 +55,8 @@ static char const printf_flags[] = "'-+ #0I";
bool opt_readone = false;
bool opt_verbose = false;
char opt_humansize = 'B';
-PackageCorpus opt_corpus = CORPUS_LOCAL;
-SearchWhat opt_what = SEARCH_EXACT;
+package_corpus_t opt_corpus = CORPUS_LOCAL;
+search_what_t opt_what = SEARCH_EXACT;
const char *opt_format = NULL;
const char *opt_timefmt = DEFAULT_TIMEFMT;
const char *opt_listdelim = DEFAULT_LISTDELIM;
@@ -643,15 +643,15 @@ static alpm_list_t *resolve_targets(alpm_list_t *dblist, alpm_list_t *targets) {
return search_exact(dblist, targets);
}
-static void expac_free(Expac *expac) {
+static void expac_free(expac_t *expac) {
if (expac == NULL)
return;
alpm_release(expac->alpm);
}
-static int expac_new(Expac **expac, const char *config_file) {
- Expac *e;
+static int expac_new(expac_t **expac, const char *config_file) {
+ expac_t *e;
enum _alpm_errno_t alpm_errno = 0;
config_t config;
const char *dbroot = "/";
@@ -688,7 +688,7 @@ static int expac_new(Expac **expac, const char *config_file) {
return 0;
}
-static alpm_list_t *expac_search_files(Expac *expac, alpm_list_t *targets) {
+static alpm_list_t *expac_search_files(expac_t *expac, alpm_list_t *targets) {
alpm_list_t *i, *r = NULL;
for (i = targets; i; i = i->next) {
@@ -707,7 +707,7 @@ static alpm_list_t *expac_search_files(Expac *expac, alpm_list_t *targets) {
return r;
}
-static alpm_list_t *expac_search_local(Expac *expac, alpm_list_t *targets) {
+static alpm_list_t *expac_search_local(expac_t *expac, alpm_list_t *targets) {
alpm_list_t *dblist, *r;
dblist = alpm_list_add(NULL, alpm_get_localdb(expac->alpm));
@@ -717,11 +717,11 @@ static alpm_list_t *expac_search_local(Expac *expac, alpm_list_t *targets) {
return r;
}
-static alpm_list_t *expac_search_sync(Expac *expac, alpm_list_t *targets) {
+static alpm_list_t *expac_search_sync(expac_t *expac, alpm_list_t *targets) {
return resolve_targets(alpm_get_syncdbs(expac->alpm), targets);
}
-static alpm_list_t *expac_search(Expac *expac, PackageCorpus corpus, alpm_list_t *targets) {
+static alpm_list_t *expac_search(expac_t *expac, package_corpus_t corpus, alpm_list_t *targets) {
switch (corpus) {
case CORPUS_LOCAL:
return expac_search_local(expac, targets);
@@ -788,7 +788,7 @@ static alpm_list_t *process_targets(int argc, char **argv) {
int main(int argc, char *argv[]) {
alpm_list_t *results = NULL, *targets = NULL;
- Expac *expac;
+ expac_t *expac;
int r;
r = parse_options(&argc, &argv);
diff --git a/expac.h b/expac.h
index b3acd4a..32e8cff 100644
--- a/expac.h
+++ b/expac.h
@@ -3,21 +3,21 @@
#include <alpm.h>
-typedef enum PackageCorpus {
+typedef enum package_corpus_t {
CORPUS_LOCAL,
CORPUS_SYNC,
CORPUS_FILE,
-} PackageCorpus;
+} package_corpus_t;
-typedef enum SearchWhat {
+typedef enum search_what_t {
SEARCH_EXACT,
SEARCH_GROUPS,
SEARCH_REGEX,
-} SearchWhat;
+} search_what_t;
-typedef struct Expac {
+typedef struct expac_t {
alpm_handle_t *alpm;
-} Expac;
+} expac_t;
#endif /* _EXPAC_H */