summaryrefslogtreecommitdiffabout
path: root/src
authorSergey Poznyakoff <gray@gnu.org.ua>2013-01-01 14:53:57 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2013-01-01 14:53:57 (GMT)
commit142ce19b4072be33c209edf1d04a221d3bab7ac6 (patch) (side-by-side diff)
tree891d796eedafc5be48f8a6c5361c516ea634dd4c /src
parent24e6dfa7cffceea0cac0f3cc349192788f040939 (diff)
downloadwydawca-142ce19b4072be33c209edf1d04a221d3bab7ac6.tar.gz
wydawca-142ce19b4072be33c209edf1d04a221d3bab7ac6.tar.bz2
Minor changes.
Diffstat (limited to 'src') (more/less context) (ignore whitespace changes)
-rw-r--r--src/backup.c1
-rw-r--r--src/config.c114
-rw-r--r--src/job.c2
-rw-r--r--src/mail.c1
-rw-r--r--src/process.c4
-rw-r--r--src/verify.c8
6 files changed, 65 insertions, 65 deletions
diff --git a/src/backup.c b/src/backup.c
index 7119ae1..5fbac53 100644
--- a/src/backup.c
+++ b/src/backup.c
@@ -151,6 +151,5 @@ find_backup_file_name(char const *file, enum backup_type type)
memcpy(newname, file, flen);
strcpy(newname + flen, suffix);
free(suffix);
- /* FIXME: Check newname length */
return newname;
}
diff --git a/src/config.c b/src/config.c
index 7cc667a..d6f6a89 100644
--- a/src/config.c
+++ b/src/config.c
@@ -162,7 +162,7 @@ notification_event_str(enum notification_event evt)
}
int
-string_to_notification_event(grecs_locus_t * locus, const char *val,
+string_to_notification_event(grecs_locus_t *locus, const char *val,
enum notification_event *pret)
{
int res;
@@ -200,7 +200,7 @@ notification_target_str(enum notification_target tgt)
}
int
-string_to_notification_target(grecs_locus_t * locus, const char *val,
+string_to_notification_target(grecs_locus_t *locus, const char *val,
enum notification_target *pret)
{
int res;
@@ -214,8 +214,8 @@ string_to_notification_target(grecs_locus_t * locus, const char *val,
}
int
-assert_string_arg(grecs_locus_t * locus,
- enum grecs_callback_command cmd, const grecs_value_t * value)
+assert_string_arg(grecs_locus_t *locus,
+ enum grecs_callback_command cmd, const grecs_value_t *value)
{
if (cmd != grecs_callback_set_value) {
grecs_error(locus, 0, _("Unexpected block statement"));
@@ -230,7 +230,7 @@ assert_string_arg(grecs_locus_t * locus,
}
grecs_value_t *
-get_arg(grecs_locus_t * locus, grecs_value_t * value, unsigned n, int type)
+get_arg(grecs_locus_t *locus, grecs_value_t *value, unsigned n, int type)
{
if (n >= value->v.arg.c) {
grecs_error(locus, 0, _("not enough arguments"));
@@ -247,8 +247,8 @@ get_arg(grecs_locus_t * locus, grecs_value_t * value, unsigned n, int type)
static int
cb_mailer(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
int rc;
@@ -265,8 +265,8 @@ cb_mailer(enum grecs_callback_command cmd,
static int
cb_email_address(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
int rc = 1;
mu_address_t addr = NULL;
@@ -316,8 +316,8 @@ cb_email_address(enum grecs_callback_command cmd,
static int
cb_interval(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
int rc;
time_t interval;
@@ -340,8 +340,8 @@ cb_interval(enum grecs_callback_command cmd,
static int
cb_absolute_name(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
char *word;
@@ -360,8 +360,8 @@ cb_absolute_name(enum grecs_callback_command cmd,
static int
cb_set_umask(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
char *p;
mode_t m;
@@ -394,7 +394,7 @@ static struct keyword stat_tab[] = {
};
static int
-parse_single_statmask(grecs_locus_t * locus, const grecs_value_t * val,
+parse_single_statmask(grecs_locus_t *locus, const grecs_value_t *val,
unsigned long *pmask, int *invert)
{
const char *arg;
@@ -428,7 +428,7 @@ parse_single_statmask(grecs_locus_t * locus, const grecs_value_t * val,
}
static int
-parse_statmask(grecs_locus_t * loc, grecs_value_t * val, unsigned long *pmask)
+parse_statmask(grecs_locus_t *loc, grecs_value_t *val, unsigned long *pmask)
{
int err = 0;
int invert = 0;
@@ -475,16 +475,16 @@ parse_statmask(grecs_locus_t * loc, grecs_value_t * val, unsigned long *pmask)
static int
cb_statistics(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
return parse_statmask(locus, value, varptr);
}
static int
cb_sql_host(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
struct sqlconn *pconn = varptr;
char *p;
@@ -525,8 +525,8 @@ cb_sql_host(enum grecs_callback_command cmd,
static int
cb_sql(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
struct sqlconn *pconn;
void **pdata = cb_data;
@@ -587,8 +587,8 @@ static struct grecs_keyword sql_kw[] = {
static int
cb_syslog_facility(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
if (assert_string_arg(locus, cmd, value))
return 1;
@@ -602,8 +602,8 @@ cb_syslog_facility(enum grecs_callback_command cmd,
static int
cb_define_message(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
const char *ident;
@@ -664,7 +664,7 @@ static struct keyword backup_tab[] = {
};
static enum backup_type
-get_backup_version(grecs_locus_t * locus, const char *ctx, const char *version)
+get_backup_version(grecs_locus_t *locus, const char *ctx, const char *version)
{
int d;
@@ -685,8 +685,8 @@ get_backup_version(grecs_locus_t * locus, const char *ctx, const char *version)
static int
cb_backup(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
enum backup_type *ptype = varptr;
@@ -711,8 +711,8 @@ static struct grecs_keyword archive_kw[] = {
static int
cb_archive(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
struct archive_descr *arch = varptr;
void **pdata = cb_data;
@@ -784,8 +784,8 @@ static struct grecs_keyword mail_statistics_kw[] = {
static int
cb_event(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
enum notification_event *pev = varptr;
@@ -797,8 +797,8 @@ cb_event(enum grecs_callback_command cmd,
static int
cb_recipient(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
enum notification_target *tgt = varptr;
@@ -831,8 +831,8 @@ static struct grecs_keyword notify_event_kw[] = {
static int
cb_notify_event(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
struct notification *ntf;
void **pdata = cb_data;
@@ -877,8 +877,8 @@ string_to_dictionary_type(const char *str)
static int
cb_dictionary_type(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
enum dictionary_type *ptype = varptr;
@@ -893,8 +893,8 @@ cb_dictionary_type(enum grecs_callback_command cmd,
static int
cb_dictionary_params(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
struct dictionary *meth = varptr;
size_t size;
@@ -949,7 +949,7 @@ static struct grecs_keyword dictionary_kw[] = {
};
int
-string_to_dictionary_id(grecs_locus_t * locus,
+string_to_dictionary_id(grecs_locus_t *locus,
const char *str, enum dictionary_id *idp)
{
static struct keyword id_tab[] = {
@@ -969,8 +969,8 @@ string_to_dictionary_id(grecs_locus_t * locus,
static int
cb_dictionary(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
struct dictionary **pmeth, *meth;
void **pdata = cb_data;
@@ -1024,8 +1024,8 @@ cb_dictionary(enum grecs_callback_command cmd,
static int
cb_url(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
mu_url_t *purl = varptr, url;
int rc;
@@ -1085,8 +1085,8 @@ static struct grecs_keyword spool_kw[] = {
static int
cb_spool(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
struct spool *spool;
void **pdata = cb_data;
@@ -1166,8 +1166,8 @@ cb_spool(enum grecs_callback_command cmd,
static int
cb_user(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
struct passwd *pw;
@@ -1188,8 +1188,8 @@ cb_user(enum grecs_callback_command cmd,
static int
cb_supp_groups(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
if (cmd != grecs_callback_set_value) {
grecs_error(locus, 0, _("Unexpected block statement"));
@@ -1245,8 +1245,8 @@ static struct grecs_keyword locking_kw[] = {
static int
cb_locking(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
if (cmd == grecs_callback_set_value) {
if (!value || value->type != GRECS_TYPE_STRING) {
@@ -1262,8 +1262,8 @@ cb_locking(enum grecs_callback_command cmd,
static int
cb_upload_version(enum grecs_callback_command cmd,
- grecs_locus_t * locus,
- void *varptr, grecs_value_t * value, void *cb_data)
+ grecs_locus_t *locus,
+ void *varptr, grecs_value_t *value, void *cb_data)
{
unsigned *pversion = varptr, n;
diff --git a/src/job.c b/src/job.c
index 01b7ae8..7a9316a 100644
--- a/src/job.c
+++ b/src/job.c
@@ -324,7 +324,7 @@ job_queue_runner(time_t min_interval)
if (job->state == STATE_QUEUED) {
if (job->timestamp >= now) {
if (job_start(job))
- pause(); /* FIXME */
+ pause();
now = time(NULL);
} else {
time_t interval = job->timestamp - now;
diff --git a/src/mail.c b/src/mail.c
index 499ebf1..2b64501 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -574,7 +574,6 @@ notify(struct notification *notification_list,
for (p = notification_list; p; p = p->next)
if (p->ev == ev)
do_notify(trp, ev, p);
- /* FIXME */
}
const char *
diff --git a/src/process.c b/src/process.c
index c2d6ed2..1226ed2 100644
--- a/src/process.c
+++ b/src/process.c
@@ -229,8 +229,8 @@ scan_spool_unlocked(struct spool *spool, int uc, uid_t * uv)
/* FIXME: prefix spool tag with something */
timer_start(spool->tag);
while ((ent = readdir(dir))) {
- if (strcmp(ent->d_name, ".") == 0
- || strcmp(ent->d_name, "..") == 0)
+ if (strcmp(ent->d_name, ".") == 0 ||
+ strcmp(ent->d_name, "..") == 0)
continue;
spool_cwd_add_new_file(spool, ent->d_name, uc, uv);
}
diff --git a/src/verify.c b/src/verify.c
index 6affda2..1306005 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -274,13 +274,15 @@ verify_directive_file(struct file_triplet *trp, int noath)
SP(info.email));
}
- if (!info.name || !info.realname || !info.gpg_key
- || !info.email) {
+ if (!info.name || !info.realname || !info.gpg_key ||
+ !info.email) {
logmsg(LOG_ERR,
_("project-uploader dictionary error: "
"malformed row %lu"),
(unsigned long)i);
- /* FIXME: Memory not reclaimed */
+ /* FIXME: Memory allocated for `info' will
+ be reclaimed only when the triplet is
+ freed. */
continue;
}

Return to:

Send suggestions and report system problems to the System administrator.