diff options
| author | Didier Raboud <odyx@debian.org> | 2012-10-25 21:07:57 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2012-10-25 21:07:57 +0200 |
| commit | 81ab83f382660bc7980ae954725c4ebf28764b03 (patch) | |
| tree | 523268f698a63a8fd44f3491d94d140266b2403b /scheduler/testsub.c | |
| parent | a75966e33dbc3e3e096338fd332f515cb313b58a (diff) | |
| download | cups-upstream/1.6.0.tar.gz | |
Imported Upstream version 1.6.0upstream/1.6.0
Diffstat (limited to 'scheduler/testsub.c')
| -rw-r--r-- | scheduler/testsub.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scheduler/testsub.c b/scheduler/testsub.c index bff8e8bc..389b9a44 100644 --- a/scheduler/testsub.c +++ b/scheduler/testsub.c @@ -1,9 +1,9 @@ /* - * "$Id: testsub.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id: testsub.c 10299 2012-02-16 00:33:54Z mike $" * * Scheduler notification tester for CUPS. * - * Copyright 2007-2010 by Apple Inc. + * Copyright 2007-2012 by Apple Inc. * Copyright 2006-2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -28,6 +28,7 @@ #include <cups/debug-private.h> #include <cups/string-private.h> #include <signal.h> +#include <cups/ipp-private.h> /* TODO: Update so we don't need this */ /* @@ -43,7 +44,7 @@ static int terminate = 0; static void print_attributes(ipp_t *ipp, int indent); static void sigterm_handler(int sig); -static void usage(void); +static void usage(void) __attribute__((noreturn)); /* @@ -302,7 +303,7 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ int i; /* Looping var */ ipp_tag_t group; /* Current group */ ipp_attribute_t *attr; /* Current attribute */ - ipp_value_t *val; /* Current value */ + _ipp_value_t *val; /* Current value */ static const char * const tags[] = /* Value/group tag strings */ { "reserved-00", @@ -452,7 +453,7 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ case IPP_TAG_RESOLUTION : for (i = 0, val = attr->values; i < attr->num_values; i ++, val ++) printf(" %dx%d%s", val->resolution.xres, val->resolution.yres, - val->resolution.units == IPP_RES_PER_INCH ? "dpi" : "dpc"); + val->resolution.units == IPP_RES_PER_INCH ? "dpi" : "dpcm"); putchar('\n'); break; @@ -518,5 +519,5 @@ usage(void) /* - * End of "$Id: testsub.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id: testsub.c 10299 2012-02-16 00:33:54Z mike $". */ |