diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-02-04 21:49:35 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2008-02-04 21:49:35 +0000 |
| commit | 77757c8d84e0fdde04be923c8a7f3ea8cd7bcf39 (patch) | |
| tree | 63683ad99b6d4ee2ec858255efa14a4b81a07b11 /src/bi_db.m4 | |
| parent | 6460de7d7ac87145594f28a416f926f830df9b8c (diff) | |
| download | mailfromd-77757c8d84e0fdde04be923c8a7f3ea8cd7bcf39.tar.gz mailfromd-77757c8d84e0fdde04be923c8a7f3ea8cd7bcf39.tar.bz2 | |
* configure.ac: Check for locale.h
* src/db.c, src/bi_sprintf.m4, src/prog.c, src/bi_db.m4,
src/engine.c: Fix format arguments (ported from
branches/gmach@{2008-01-28 and 2008-01-09).
* src/main.c, src/mtasim.c: Include locale.h
git-svn-id: file:///svnroot/mailfromd/trunk@1603 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (limited to 'src/bi_db.m4')
| -rw-r--r-- | src/bi_db.m4 | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/bi_db.m4 b/src/bi_db.m4 index bb0b9f48..f366008f 100644 --- a/src/bi_db.m4 +++ b/src/bi_db.m4 @@ -1,5 +1,5 @@ -/* This file is part of mailfromd. -*- c -*- - Copyright (C) 2006, 2007 Sergey Poznyakoff +/* This file is part of Mailfromd. -*- c -*- + Copyright (C) 2006, 2007, 2008 Sergey Poznyakoff This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -137,7 +137,7 @@ MF_DEFUN(dbdel, VOID, STRING dbname, STRING keystr, OPTIONAL, NUMBER null) MF_ASSERT(rc == 0, mf_dbfailure, _("Failed to delete data `%s' from `%s': %s"), - key, + keystr, dbname, mu_dbm_strerror()); } @@ -238,9 +238,10 @@ MF_DEFUN(greylist, NUMBER, STRING email, NUMBER interval) memcpy(MU_DATUM_PTR(contents), &now, sizeof now); if (mu_dbm_insert(&db, key, contents, 1)) - mu_error(_("Cannot insert datum `%s' in " + mu_error(_("Cannot insert datum `%-.*s' in " "greylist database %s: %s"), - key, + MU_DATUM_SIZE(key), + (char*)MU_DATUM_PTR(key), greylist_format->dbname, mu_dbm_strerror()); } else @@ -259,9 +260,9 @@ MF_DEFUN(greylist, NUMBER, STRING email, NUMBER interval) MU_DATUM_PTR(contents) = (void*)&now; MU_DATUM_SIZE(contents) = sizeof now; if (mu_dbm_insert(&db, key, contents, 1)) - mu_error(_("Cannot insert datum `%s' in greylist " + mu_error(_("Cannot insert datum `%-.*s' in greylist " "database %s: %s"), - key, + MU_DATUM_SIZE(key), (char*)MU_DATUM_PTR(key), greylist_format->dbname, mu_dbm_strerror()); rc = 1; |