summaryrefslogtreecommitdiff
path: root/source3/libsmb/libsmb_printjob.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-21 22:52:12 +0100
committerVolker Lendecke <vl@samba.org>2009-11-21 23:19:50 +0100
commite28545e85472c630244205f5c3fae4956089daa3 (patch)
treeade2f4e5461f0b0cb287add899d001ee3403d487 /source3/libsmb/libsmb_printjob.c
parent384f303c2cafa6659c24a62209de846cd5d45d84 (diff)
downloadsamba-e28545e85472c630244205f5c3fae4956089daa3.tar.gz
samba-e28545e85472c630244205f5c3fae4956089daa3.tar.bz2
samba-e28545e85472c630244205f5c3fae4956089daa3.zip
s3: Fix some nonempty blank lines
Diffstat (limited to 'source3/libsmb/libsmb_printjob.c')
-rw-r--r--source3/libsmb/libsmb_printjob.c100
1 files changed, 39 insertions, 61 deletions
diff --git a/source3/libsmb/libsmb_printjob.c b/source3/libsmb/libsmb_printjob.c
index c8d7ad039d..ea0cb37a14 100644
--- a/source3/libsmb/libsmb_printjob.c
+++ b/source3/libsmb/libsmb_printjob.c
@@ -7,17 +7,17 @@
Copyright (C) Tom Jansen (Ninja ISD) 2002
Copyright (C) Derrell Lipman 2003-2008
Copyright (C) Jeremy Allison 2007, 2008
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -41,22 +41,21 @@ SMBC_open_print_job_ctx(SMBCCTX *context,
char *password = NULL;
char *path = NULL;
TALLOC_CTX *frame = talloc_stackframe();
-
+
if (!context || !context->internal->initialized) {
-
errno = EINVAL;
TALLOC_FREE(frame);
return NULL;
}
-
+
if (!fname) {
errno = EINVAL;
TALLOC_FREE(frame);
return NULL;
}
-
+
DEBUG(4, ("SMBC_open_print_job_ctx(%s)\n", fname));
-
+
if (SMBC_parse_path(frame,
context,
fname,
@@ -71,9 +70,9 @@ SMBC_open_print_job_ctx(SMBCCTX *context,
TALLOC_FREE(frame);
return NULL;
}
-
+
/* What if the path is empty, or the file exists? */
-
+
TALLOC_FREE(frame);
return smbc_getFunctionOpen(context)(context, fname, O_WRONLY, 666);
}
@@ -98,79 +97,66 @@ SMBC_print_file_ctx(SMBCCTX *c_file,
int tot_bytes = 0;
char buf[4096];
TALLOC_CTX *frame = talloc_stackframe();
-
+
if (!c_file || !c_file->internal->initialized ||
!c_print || !c_print->internal->initialized) {
-
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
-
}
-
+
if (!fname && !printq) {
-
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
-
}
-
+
/* Try to open the file for reading ... */
-
+
if ((long)(fid1 = smbc_getFunctionOpen(c_file)(c_file, fname,
O_RDONLY, 0666)) < 0) {
DEBUG(3, ("Error, fname=%s, errno=%i\n", fname, errno));
TALLOC_FREE(frame);
return -1; /* smbc_open sets errno */
}
-
+
/* Now, try to open the printer file for writing */
-
+
if ((long)(fid2 = smbc_getFunctionOpenPrintJob(c_print)(c_print,
printq)) < 0) {
-
saverr = errno; /* Save errno */
smbc_getFunctionClose(c_file)(c_file, fid1);
errno = saverr;
TALLOC_FREE(frame);
return -1;
-
}
-
+
while ((bytes = smbc_getFunctionRead(c_file)(c_file, fid1,
buf, sizeof(buf))) > 0) {
-
tot_bytes += bytes;
-
+
if ((smbc_getFunctionWrite(c_print)(c_print, fid2,
buf, bytes)) < 0) {
-
saverr = errno;
smbc_getFunctionClose(c_file)(c_file, fid1);
smbc_getFunctionClose(c_print)(c_print, fid2);
errno = saverr;
-
}
-
}
-
+
saverr = errno;
-
+
smbc_getFunctionClose(c_file)(c_file, fid1);
smbc_getFunctionClose(c_print)(c_print, fid2);
-
+
if (bytes < 0) {
-
errno = saverr;
TALLOC_FREE(frame);
return -1;
-
}
-
+
TALLOC_FREE(frame);
return tot_bytes;
-
}
/*
@@ -190,22 +176,21 @@ SMBC_list_print_jobs_ctx(SMBCCTX *context,
char *workgroup = NULL;
char *path = NULL;
TALLOC_CTX *frame = talloc_stackframe();
-
+
if (!context || !context->internal->initialized) {
-
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
}
-
+
if (!fname) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
}
-
+
DEBUG(4, ("smbc_list_print_jobs(%s)\n", fname));
-
+
if (SMBC_parse_path(frame,
context,
fname,
@@ -220,7 +205,7 @@ SMBC_list_print_jobs_ctx(SMBCCTX *context,
TALLOC_FREE(frame);
return -1;
}
-
+
if (!user || user[0] == (char)0) {
user = talloc_strdup(frame, smbc_getUser(context));
if (!user) {
@@ -229,25 +214,24 @@ SMBC_list_print_jobs_ctx(SMBCCTX *context,
return -1;
}
}
-
+
srv = SMBC_server(frame, context, True,
server, share, &workgroup, &user, &password);
-
+
if (!srv) {
TALLOC_FREE(frame);
return -1; /* errno set by SMBC_server */
}
-
+
if (cli_print_queue(srv->cli,
(void (*)(struct print_job_info *))fn) < 0) {
errno = SMBC_errno(context, srv->cli);
TALLOC_FREE(frame);
return -1;
}
-
+
TALLOC_FREE(frame);
return 0;
-
}
/*
@@ -268,22 +252,21 @@ SMBC_unlink_print_job_ctx(SMBCCTX *context,
char *path = NULL;
int err;
TALLOC_CTX *frame = talloc_stackframe();
-
+
if (!context || !context->internal->initialized) {
-
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
}
-
+
if (!fname) {
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
}
-
+
DEBUG(4, ("smbc_unlink_print_job(%s)\n", fname));
-
+
if (SMBC_parse_path(frame,
context,
fname,
@@ -298,7 +281,7 @@ SMBC_unlink_print_job_ctx(SMBCCTX *context,
TALLOC_FREE(frame);
return -1;
}
-
+
if (!user || user[0] == (char)0) {
user = talloc_strdup(frame, smbc_getUser(context));
if (!user) {
@@ -307,30 +290,25 @@ SMBC_unlink_print_job_ctx(SMBCCTX *context,
return -1;
}
}
-
+
srv = SMBC_server(frame, context, True,
server, share, &workgroup, &user, &password);
-
+
if (!srv) {
-
TALLOC_FREE(frame);
return -1; /* errno set by SMBC_server */
-
}
-
+
if ((err = cli_printjob_del(srv->cli, id)) != 0) {
-
if (err < 0)
errno = SMBC_errno(context, srv->cli);
else if (err == ERRnosuchprintjob)
errno = EINVAL;
TALLOC_FREE(frame);
return -1;
-
}
-
+
TALLOC_FREE(frame);
return 0;
-
}