diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-07-15 01:21:40 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-07-15 01:21:40 +0000 |
| commit | 1f0275e3cc0bc5fbe11e3bffd54581aa05c9c764 (patch) | |
| tree | fac6166e65e5ecf207f69d77e00529a7337d91ac /cups/testcups.c | |
| parent | 4509bb49335b3edfdb1b03d83d6cd05890968b59 (diff) | |
| download | cups-1f0275e3cc0bc5fbe11e3bffd54581aa05c9c764.tar.gz | |
Merge changes from CUPS 1.4svn-r7715.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@859 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/testcups.c')
| -rw-r--r-- | cups/testcups.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cups/testcups.c b/cups/testcups.c index 1ac4456bd..087ed4310 100644 --- a/cups/testcups.c +++ b/cups/testcups.c @@ -3,7 +3,7 @@ * * CUPS API test program for the Common UNIX Printing System (CUPS). * - * Copyright 2007 by Apple Inc. + * Copyright 2007-2008 by Apple Inc. * Copyright 2007 by Easy Software Products. * * These coded instructions, statements, and computer programs are the @@ -155,7 +155,6 @@ main(int argc, /* I - Number of command-line arguments */ if ((dest = cupsGetDest(dests[num_dests / 2].name, NULL, num_dests, dests)) == NULL) { - status = 1; puts("FAIL"); return (1); } @@ -201,8 +200,8 @@ main(int argc, /* I - Number of command-line arguments */ if (cupsPrintFile(dest->name, "../data/testprint.ps", "Test Page", dest->num_options, dest->options) <= 0) { - status = 1; puts("FAIL"); + return (1); } else puts("PASS"); @@ -216,7 +215,6 @@ main(int argc, /* I - Number of command-line arguments */ if ((ppdfile = cupsGetPPD(dest->name)) == NULL) { - status = 1; puts("FAIL"); } else @@ -282,7 +280,7 @@ dests_equal(cups_dest_t *a, /* I - First destination */ if (a == b) return (1); - if ((!a && b) || (a && !b)) + if (!a || !b) return (0); if (strcasecmp(a->name, b->name) || @@ -345,5 +343,5 @@ show_diffs(cups_dest_t *a, /* I - First destination */ /* - * End of "$Id: testfile.c 6192 2007-01-10 19:26:48Z mike $". + * End of "$Id$". */ |