diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-07 22:31:27 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-07 22:31:27 +0000 |
| commit | 85dda01c84763aecc4d31e15246d0ac5986eedae (patch) | |
| tree | 4f8b999e8443b1c8def8c79d70338bd4e0179e29 /systemv/cupstestppd.c | |
| parent | a48458814a4c26a6430b27105c0ab747c907473f (diff) | |
Merge changes from CUPS 1.6svn-r9968.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3411 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'systemv/cupstestppd.c')
| -rw-r--r-- | systemv/cupstestppd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index 3dfa7bf5f..3765f4754 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -129,7 +129,7 @@ static int check_translations(ppd_file_t *ppd, int errors, int verbose, int warn); static void show_conflicts(ppd_file_t *ppd, const char *prefix); static int test_raster(ppd_file_t *ppd, int verbose); -static void usage(void); +static void usage(void) __attribute__((noreturn)); static int valid_path(const char *keyword, const char *path, int errors, int verbose, int warn); static int valid_utf8(const char *s); @@ -2320,7 +2320,6 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ int verbose, /* I - Verbosity level */ int warn) /* I - Warnings only? */ { - int i; /* Looping var */ ppd_attr_t *attr; /* PPD attribute */ const char *ptr; /* Pointer into string */ char super[16], /* Super-type for filter */ @@ -2368,7 +2367,7 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ if (verbose >= 0) _cupsLangPrintf(stdout, _(" %s Bad cupsFilter value \"%s\"."), - prefix, ppd->filters[i]); + prefix, attr->value); if (!warn) errors ++; @@ -2454,7 +2453,7 @@ check_filters(ppd_file_t *ppd, /* I - PPD file */ if (verbose >= 0) _cupsLangPrintf(stdout, _(" %s Bad cupsFilter2 value \"%s\"."), - prefix, ppd->filters[i]); + prefix, attr->value); if (!warn) errors ++; |