← Back to branch summary

~andreserl/ubuntu/lucid/bind9/bind9-apport-533601

« back to all changes in this revision

Viewing changes to lib/bind/isc/logging.c

  • Committer: Bazaar Package Importer
  • Author(s): LaMont Jones, LaMont Jones, Internet Software Consortium, Inc, localization folks
  • Date: 2008-08-02 14:20:20 UTC
  • mfrom: (1.2.1 upstream) (6.1.24 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080802142020-l1hon9jy8lbbjxmg
http://bugs.debian.org/149259
http://bugs.debian.org/492418
http://bugs.debian.org/493392
http://bugs.debian.org/492564
http://bugs.debian.org/490027
http://bugs.debian.org/492949
http://bugs.debian.org/492425
http://bugs.debian.org/491369
http://bugs.debian.org/492048
http://bugs.debian.org/490630
http://bugs.debian.org/492587
[LaMont Jones]

* default to using resolvconf if it is installed
* fix sonames and dependencies.  Closes: #149259, #492418
* Do not build-depend libcap2-dev on non-linux.  Closes: #493392
* drop unused query-loc manpage.  Closes: #492564
* lwresd: Deliver /etc/bind directory.  Closes: #490027
* fix query-source comment in default install

[Internet Software Consortium, Inc]

* 9.5.0-P2.  Closes: #492949

[localization folks]

* l10n: Spanish debconf translation.  Closes: #492425 (Ignacio Mondino)
* l10n: Swedish debconf templates.  Closes: #491369 (Martin Ågren)
* l10n: Japanese debconf translations.  Closes: #492048 (Hideki Yamane
  (Debian-JP))
* l10n: Finnish translation.  Closes: #490630 (Esko Arajärvi)
* l10n: Italian debconf translations.  Closes: #492587 (Alessandro Vietta)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/bind/isc/logging.c
16
16
 */
17
17
 
18
18
#if !defined(LINT) && !defined(CODECENTER)
19
 
static const char rcsid[] = "$Id: logging.c,v 1.3.2.1.4.2 2004/03/17 01:49:42 marka Exp $";
 
19
static const char rcsid[] = "$Id: logging.c,v 1.7.672.1 2008/02/28 05:46:12 marka Exp $";
20
20
#endif /* not lint */
21
21
 
22
22
#include "port_before.h"
43
43
 
44
44
#include "port_after.h"
45
45
 
46
 
#ifdef VSPRINTF_CHAR
47
 
# define VSPRINTF(x) strlen(vsprintf/**/x)
48
 
#else
49
 
# define VSPRINTF(x) ((size_t)vsprintf x)
50
 
#endif
51
 
 
52
46
#include "logging_p.h"
53
47
 
54
48
static const int syslog_priority[] = { LOG_DEBUG, LOG_INFO, LOG_NOTICE,
258
252
                return (0);
259
253
 
260
254
        if (category < 0 || category > lc->num_categories)
261
 
                category = 0;           /* use default */
 
255
                category = 0;           /*%< use default */
262
256
        lcl = lc->categories[category];
263
257
        if (lcl == NULL) {
264
258
                category = 0;
302
296
                return;
303
297
 
304
298
        if (category < 0 || category > lc->num_categories)
305
 
                category = 0;           /* use default */
 
299
                category = 0;           /*%< use default */
306
300
        original_category = category;
307
301
        lcl = lc->categories[category];
308
302
        if (lcl == NULL) {
363
357
                        continue;
364
358
 
365
359
                if (!did_vsprintf) {
366
 
                        if (VSPRINTF((lc->buffer, format, args)) >
367
 
                            (size_t)LOG_BUFFER_SIZE) {
 
360
                        (void)vsprintf(lc->buffer, format, args);
 
361
                        if (strlen(lc->buffer) > (size_t)LOG_BUFFER_SIZE) {
368
362
                                syslog(LOG_CRIT,
369
363
                                       "memory overrun in log_vwrite()");
370
364
                                exit(1);
441
435
        va_end(args);
442
436
}
443
437
 
444
 
/*
 
438
/*%
445
439
 * Functions to create, set, or destroy contexts
446
440
 */
447
441
 
718
712
        }
719
713
        return (0);
720
714
}
 
715
 
 
716
/*! \file */