diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-12 15:03:59 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-03-12 15:22:13 +0200 |
commit | 1ba8cf95a5f536d4aa6293f9848271a7285bc092 (patch) | |
tree | dede8a4bccb1daad8b67530d87845e7fe05749e6 /src/wydawca.c | |
parent | 293108d7806aa3c0c5e706237b3788b261779e66 (diff) | |
download | wydawca-1ba8cf95a5f536d4aa6293f9848271a7285bc092.tar.gz wydawca-1ba8cf95a5f536d4aa6293f9848271a7285bc092.tar.bz2 |
Namespace normalization (2). Provide installable headers.
* Makefile.am (SUBDIRS): Add include.
* configure.ac: Build include/*/Makefile
Set-up grecs as a shared convenience library. Install
its headers.
* include/Makefile.am: New file.
* include/wydawca/Makefile.am: New file.
* include/wydawca/cfg.h: New file.
* include/wydawca/wydawca.h: New file.
* modules/mailutils/Makefile.am (AM_CPPFLAGS): Add include/
* src/Makefile.am (LDADD): Use @GRECS_LDADD@
(AM_CPPFLAGS): Add include/.
* tests/Makefile.am: Likewise.
* src/wydawca.h: Include wydawca/wydawca.h.
(__cat2__, __cat3__): Move to installable header and rename.
(struct wy_user): Move to installable header.
(struct file_triplet): Rename to wy_triplet. All uses changed.
(enum notification_event): Rename to wy_event and move to
installable header.
(struct metadef): Rename to wy_metadef and move to
installable header.
(dry_run_mode): Rename to wy_dry_run and move to
installable header.
(wydawca_gpg_homedir): Rename to wy_gpg_homedir and move to
installable header.
(wy_version, wy_debug_level, wy_log_to_stderr)
(wy_log_facility, wy_syslog_tag)
(wy_log,wy_dbg): Move to installable header.
* modules/mailutils/mod_mailutils.c: Update.
* src/cmdline.opt
* src/config.c
* src/directive.c
* src/diskio.c
* src/event.c
* src/gpg.c
* src/job.c
* src/meta.c
* src/module.c
* src/null.c
* src/timer.c
* src/triplet.c
* src/verify.c
* src/vtab.c
* src/watcher.c
* src/wydawca.c
Diffstat (limited to 'src/wydawca.c')
-rw-r--r-- | src/wydawca.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/wydawca.c b/src/wydawca.c index e88ec34..3561994 100644 --- a/src/wydawca.c +++ b/src/wydawca.c @@ -24,7 +24,7 @@ gid_t *wydawca_supp_groups; char *conffile = SYSCONFDIR "/wydawca.rc"; const char *wy_version = "wydawca (" PACKAGE_STRING ")"; int wy_debug_level; -int dry_run_mode; +int wy_dry_run; int wy_log_to_stderr = -1; /* -1 means autodetect */ int wy_log_facility = LOG_LOCAL1; char *wy_syslog_tag = "wydawca"; @@ -44,7 +44,7 @@ int foreground; int single_process; time_t wakeup_interval; struct grecs_list *all_spool_aliases; -char *wydawca_gpg_homedir; +char *wy_gpg_homedir; char *default_check_script; struct grecs_sockaddr listen_sockaddr; @@ -171,7 +171,7 @@ static char *stat_kwname[MAX_STAT] = { }; int -stat_mask_p(unsigned long mask) +wy_stat_mask_p(unsigned long mask) { int i; @@ -182,7 +182,7 @@ stat_mask_p(unsigned long mask) } static const char * -stat_expand(struct metadef *def, void *data) +stat_expand(struct wy_metadef *def, void *data) { size_t size = 0; def->storage = NULL; @@ -193,11 +193,11 @@ stat_expand(struct metadef *def, void *data) return def->value; } -struct metadef * +struct wy_metadef * make_stat_expansion(size_t count) { int i; - struct metadef *def, *p; + struct wy_metadef *def, *p; def = grecs_calloc(MAX_STAT + count + 1, sizeof(def[0])); p = def + count; for (i = 0; i < MAX_STAT; i++, p++) { @@ -216,7 +216,7 @@ logstats() { int i; - if (stat_mask_p(print_stats)) { + if (wy_stat_mask_p(print_stats)) { for (i = 0; i < MAX_STAT; i++) if (print_stats & STAT_MASK(i)) wy_log(LOG_INFO, "%s: %u", @@ -373,7 +373,7 @@ main(int argc, char **argv) if (lint_mode) exit(0); - if (dry_run_mode || selected_spools()) + if (wy_dry_run || selected_spools()) cron_option = 1; if (cron_option) daemon_mode = 0; |