diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-01-17 00:06:33 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2008-01-17 00:06:33 +0000 |
| commit | 91c84a3551145559de2956179661e111e373db95 (patch) | |
| tree | ea061b2b6ab3b9e4530347e35f5cde3511f8a305 /systemv/lpmove.c | |
| parent | 080811b190031b9182e96dc76fc610fadfeaec21 (diff) | |
| download | cups-91c84a3551145559de2956179661e111e373db95.tar.gz | |
Import CUPS 1.4svn-r7226.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@582 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'systemv/lpmove.c')
| -rw-r--r-- | systemv/lpmove.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/systemv/lpmove.c b/systemv/lpmove.c index 0795737f1..88d2a154a 100644 --- a/systemv/lpmove.c +++ b/systemv/lpmove.c @@ -61,7 +61,6 @@ main(int argc, /* I - Number of command-line arguments */ dest = NULL; dests = NULL; - http = NULL; job = NULL; jobid = 0; num_dests = 0; @@ -75,8 +74,6 @@ main(int argc, /* I - Number of command-line arguments */ #ifdef HAVE_SSL cupsSetEncryption(HTTP_ENCRYPT_REQUIRED); - if (http) - httpEncryption(http, HTTP_ENCRYPT_REQUIRED); #else _cupsLangPrintf(stderr, _("%s: Sorry, no encryption support compiled in!\n"), @@ -85,12 +82,6 @@ main(int argc, /* I - Number of command-line arguments */ break; case 'h' : /* Connect to host */ - if (http) - { - httpClose(http); - http = NULL; - } - if (argv[i][2] != '\0') cupsSetServer(argv[i] + 2); else @@ -142,17 +133,14 @@ main(int argc, /* I - Number of command-line arguments */ return (1); } - if (!http) - { - http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption()); + http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption()); - if (http == NULL) - { - _cupsLangPrintf(stderr, - _("lpmove: Unable to connect to server: %s\n"), - strerror(errno)); - return (1); - } + if (http == NULL) + { + _cupsLangPrintf(stderr, + _("lpmove: Unable to connect to server: %s\n"), + strerror(errno)); + return (1); } return (move_job(http, src, jobid, dest)); |