From 10243bb069053a813aa803c1bbd2620ef4f0deab Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Thu, 16 Feb 2017 00:53:36 +0200 Subject: [PATCH] 8200 cmd/lp: misleading-indentation Reviewed by: Marcel Telka Approved by: Gordon Ross --- usr/src/cmd/lp/cmd/lpadmin/do_printer.c | 531 +++++++++++++++----------------- usr/src/cmd/lp/model/netpr/netpr.c | 118 ++++--- 2 files changed, 307 insertions(+), 342 deletions(-) diff --git a/usr/src/cmd/lp/cmd/lpadmin/do_printer.c b/usr/src/cmd/lp/cmd/lpadmin/do_printer.c index c1807965f7..c26c59e39a 100644 --- a/usr/src/cmd/lp/cmd/lpadmin/do_printer.c +++ b/usr/src/cmd/lp/cmd/lpadmin/do_printer.c @@ -28,8 +28,6 @@ * Copyright (c) 2016 by Delphix. All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -49,18 +47,18 @@ #include "msgs.h" #define WHO_AM_I I_AM_LPADMIN -#include "oam.h" +#include "oam.h" #include "lpadmin.h" extern void fromallclasses(); -#if !defined(PATH_MAX) -# define PATH_MAX 1024 +#if !defined(PATH_MAX) +#define PATH_MAX 1024 #endif -#if PATH_MAX < 1024 -# undef PATH_MAX -# define PATH_MAX 1024 +#if PATH_MAX < 1024 +#undef PATH_MAX +#define PATH_MAX 1024 #endif extern char *label; @@ -70,38 +68,40 @@ static char *fullpath(); char *nameit(); static void pack_white(char *ptr); -/** - ** do_printer() - CREATE OR CHANGE PRINTER - **/ +/* + * do_printer() - CREATE OR CHANGE PRINTER + */ -void do_printer () +void +do_printer(void) { - int rc; + int rc; /* * Set or change the printer configuration. */ if (strlen(modifications)) - configure_printer (modifications); + configure_printer(modifications); /* * Allow/deny forms. */ BEGIN_CRITICAL if (!oldp) - if (allow_form_printer(getlist(NAME_NONE, "", ","), p) == -1) { - LP_ERRMSG1 (ERROR, E_ADM_ACCESSINFO, PERROR); + if (allow_form_printer( + getlist(NAME_NONE, "", ","), p) == -1) { + LP_ERRMSG1(ERROR, E_ADM_ACCESSINFO, PERROR); done(1); } if (f_allow || f_deny) { if (f_allow && allow_form_printer(f_allow, p) == -1) { - LP_ERRMSG1 (ERROR, E_ADM_ACCESSINFO, PERROR); + LP_ERRMSG1(ERROR, E_ADM_ACCESSINFO, PERROR); done(1); } if (f_deny && deny_form_printer(f_deny, p) == -1) { - LP_ERRMSG1 (ERROR, E_ADM_ACCESSINFO, PERROR); + LP_ERRMSG1(ERROR, E_ADM_ACCESSINFO, PERROR); done(1); } } @@ -111,21 +111,22 @@ void do_printer () BEGIN_CRITICAL if (!oldp) - if (add_paper_to_printer(getlist(NAME_NONE, "", ","),p) == -1) { - LP_ERRMSG1 (ERROR, E_ADM_ACCESSINFO, PERROR); + if (add_paper_to_printer( + getlist(NAME_NONE, "", ","), p) == -1) { + LP_ERRMSG1(ERROR, E_ADM_ACCESSINFO, PERROR); done(1); } - if (p_add && add_paper_to_printer(p_add, p) == -1) { - LP_ERRMSG1 (ERROR, E_ADM_ACCESSINFO, PERROR); - done(1); - } + if (p_add && add_paper_to_printer(p_add, p) == -1) { + LP_ERRMSG1(ERROR, E_ADM_ACCESSINFO, PERROR); + done(1); + } - if (p_remove && remove_paper_from_printer(p_remove, p) == -1) { - LP_ERRMSG1 (ERROR, E_ADM_ACCESSINFO, PERROR); - done(1); - } + if (p_remove && remove_paper_from_printer(p_remove, p) == -1) { + LP_ERRMSG1(ERROR, E_ADM_ACCESSINFO, PERROR); + done(1); + } END_CRITICAL /* @@ -133,19 +134,20 @@ void do_printer () */ BEGIN_CRITICAL if (!oldp) - if (allow_user_printer(getlist(NAME_ALL, "", ","), p) == -1) { - LP_ERRMSG1 (ERROR, E_ADM_ACCESSINFO, PERROR); + if (allow_user_printer( + getlist(NAME_ALL, "", ","), p) == -1) { + LP_ERRMSG1(ERROR, E_ADM_ACCESSINFO, PERROR); done(1); } if (u_allow || u_deny) { if (u_allow && allow_user_printer(u_allow, p) == -1) { - LP_ERRMSG1 (ERROR, E_ADM_ACCESSINFO, PERROR); + LP_ERRMSG1(ERROR, E_ADM_ACCESSINFO, PERROR); done(1); } if (u_deny && deny_user_printer(u_deny, p) == -1) { - LP_ERRMSG1 (ERROR, E_ADM_ACCESSINFO, PERROR); + LP_ERRMSG1(ERROR, E_ADM_ACCESSINFO, PERROR); done(1); } } @@ -163,18 +165,18 @@ void do_printer () case MNODEST: case MERRDEST: - LP_ERRMSG (ERROR, E_ADM_ERRDEST); - done (1); + LP_ERRMSG(ERROR, E_ADM_ERRDEST); + done(1); /*NOTREACHED*/ case MNOSPACE: - LP_ERRMSG (WARNING, E_ADM_NOPSPACE); + LP_ERRMSG(WARNING, E_ADM_NOPSPACE); break; case MNOPERM: /* taken care of up front */ default: - LP_ERRMSG1 (ERROR, E_LP_BADSTATUS, rc); - done (1); + LP_ERRMSG1(ERROR, E_LP_BADSTATUS, rc); + done(1); /*NOTREACHED*/ } @@ -187,8 +189,9 @@ void do_printer () * Mount or unmount form, print-wheel. */ if (M) - do_mount(p, (f? f : (char *)0), (S? *S : (char *)0)); - else if (t) do_max_trays(p); + do_mount(p, (f? f : NULL), (S? *S : NULL)); + else if (t) + do_max_trays(p); /* * Display the alert type. @@ -196,7 +199,7 @@ void do_printer () if (A && STREQU(A, NAME_LIST)) { if (label) (void) printf(gettext("Printer %s: "), label); - printalert (stdout, &(oldp->fault_alert), 1); + printalert(stdout, &(oldp->fault_alert), 1); } /* @@ -207,19 +210,19 @@ void do_printer () send_message(S_QUIET_ALERT, p, (char *)QA_PRINTER, ""); rc = output(R_QUIET_ALERT); - switch(rc) { + switch (rc) { case MOK: break; case MNODEST: /* not quite, but not a lie either */ case MERRDEST: - LP_ERRMSG1 (WARNING, E_LP_NOQUIET, p); + LP_ERRMSG1(WARNING, E_LP_NOQUIET, p); break; case MNOPERM: /* taken care of up front */ default: - LP_ERRMSG1 (ERROR, E_LP_BADSTATUS, rc); - done (1); + LP_ERRMSG1(ERROR, E_LP_BADSTATUS, rc); + done(1); /*NOTREACHED*/ } } @@ -228,8 +231,8 @@ void do_printer () * Add printer p to class c */ if (c) { - CLASS *pc, - clsbuf; + CLASS *pc; + CLASS clsbuf; if (STREQU(c, NAME_ANY)) c = NAME_ALL; @@ -239,13 +242,8 @@ Loop: if (!(pc = getclass(c))) { goto Done; if (errno != ENOENT) { - LP_ERRMSG2 ( - ERROR, - E_LP_GETCLASS, - c, - PERROR - ); - done (1); + LP_ERRMSG2(ERROR, E_LP_GETCLASS, c, PERROR); + done(1); } /* @@ -254,52 +252,48 @@ Loop: if (!(pc = getclass(c))) { clsbuf.name = strdup(c); clsbuf.members = 0; if (addlist(&clsbuf.members, p) == -1) { - LP_ERRMSG (ERROR, E_LP_MALLOC); - done (1); + LP_ERRMSG(ERROR, E_LP_MALLOC); + done(1); } pc = &clsbuf; } else if (searchlist(p, pc->members)) - LP_ERRMSG2 (WARNING, E_ADM_INCLASS, p, pc->name); + LP_ERRMSG2(WARNING, E_ADM_INCLASS, p, pc->name); else if (addlist(&pc->members, p) == -1) { - LP_ERRMSG (ERROR, E_LP_MALLOC); - done (1); + LP_ERRMSG(ERROR, E_LP_MALLOC); + done(1); } BEGIN_CRITICAL if (putclass(pc->name, pc) == -1) { - LP_ERRMSG2 ( - ERROR, - E_LP_PUTCLASS, - pc->name, - PERROR - ); + LP_ERRMSG2(ERROR, E_LP_PUTCLASS, pc->name, + PERROR); done(1); } END_CRITICAL - send_message (S_LOAD_CLASS, pc->name); + send_message(S_LOAD_CLASS, pc->name); rc = output(R_LOAD_CLASS); - switch(rc) { + switch (rc) { case MOK: break; case MNODEST: case MERRDEST: - LP_ERRMSG (ERROR, E_ADM_ERRDEST); - done (1); + LP_ERRMSG(ERROR, E_ADM_ERRDEST); + done(1); /*NOTREACHED*/ case MNOSPACE: - LP_ERRMSG (WARNING, E_ADM_NOCSPACE); + LP_ERRMSG(WARNING, E_ADM_NOCSPACE); break; case MNOPERM: /* taken care of up front */ default: - LP_ERRMSG1 (ERROR, E_LP_BADSTATUS, rc); - done (1); + LP_ERRMSG1(ERROR, E_LP_BADSTATUS, rc); + done(1); /*NOTREACHED*/ } @@ -316,24 +310,19 @@ Done: else fromclass(p, r); } - - return; } -/** - ** configure_printer() - SET OR CHANGE CONFIGURATION OF PRINTER - **/ +/* + * configure_printer() - SET OR CHANGE CONFIGURATION OF PRINTER + */ -static void configure_printer (list) - char *list; +static void +configure_printer(char *list) { - register PRINTER *prbufp; - - PRINTER printer_struct; - - char type; - char * infile_opts = NULL; - + PRINTER *prbufp; + PRINTER printer_struct; + char type; + char *infile_opts = NULL; if (oldp) { @@ -388,7 +377,7 @@ static void configure_printer (list) */ } else if (oldp->remote) { prbufp->banner = BAN_ALWAYS; - prbufp->interface = makepath(Lp_Model, STANDARD, (char *)0); + prbufp->interface = makepath(Lp_Model, STANDARD, NULL); prbufp->fault_alert.shcmd = nameit(NAME_MAIL); /* @@ -409,14 +398,14 @@ static void configure_printer (list) * or substructure members) needs to be considered * for EACH NEW MEMBER added to the structure. */ - (void)memset (&printer_struct, 0, sizeof(printer_struct)); + (void) memset(&printer_struct, 0, sizeof (printer_struct)); prbufp = &printer_struct; prbufp->banner = BAN_ALWAYS; prbufp->cpi.val = 0; prbufp->cpi.sc = 0; if (!s) - prbufp->interface = makepath(Lp_Model, m, (char *)0); + prbufp->interface = makepath(Lp_Model, m, NULL); prbufp->lpi.val = 0; prbufp->lpi.sc = 0; prbufp->plen.val = 0; @@ -430,211 +419,194 @@ static void configure_printer (list) prbufp->options = NULL; } - while ((type = *list++) != '\0') switch(type) { - - case 'A': - if (!s) { - if (STREQU(A, NAME_MAIL) || STREQU(A, NAME_WRITE)) - prbufp->fault_alert.shcmd = nameit(A); - else if (!STREQU(A, NAME_QUIET)) - prbufp->fault_alert.shcmd = A; - } - break; + while ((type = *list++) != '\0') { + switch (type) { + case 'A': + if (!s) { + if (STREQU(A, NAME_MAIL) || + STREQU(A, NAME_WRITE)) + prbufp->fault_alert.shcmd = nameit(A); + else if (!STREQU(A, NAME_QUIET)) + prbufp->fault_alert.shcmd = A; + } + break; - case 'b': - if (!s) - prbufp->banner = banner; - break; + case 'b': + if (!s) + prbufp->banner = banner; + break; - case 'c': - if (!s) - prbufp->cpi = cpi_sdn; - break; + case 'c': + if (!s) + prbufp->cpi = cpi_sdn; + break; - case 'D': - prbufp->description = D; - break; + case 'D': + prbufp->description = D; + break; - case 'e': - if (!s) { - prbufp->interface = makepath( - Lp_A_Interfaces, - e, - (char *)0 - ); - } - break; + case 'e': + if (!s) { + prbufp->interface = makepath(Lp_A_Interfaces, + e, NULL); + } + break; - case 'F': - if (!s) - prbufp->fault_rec = F; - break; + case 'F': + if (!s) + prbufp->fault_rec = F; + break; #if defined(CAN_DO_MODULES) - case 'H': - if (!s) - prbufp->modules = H; - break; + case 'H': + if (!s) + prbufp->modules = H; + break; #endif - case 'h': - if (!s) - prbufp->login = 0; - break; + case 'h': + if (!s) + prbufp->login = 0; + break; - case 'i': - if (!s) - prbufp->interface = fullpath(i); - break; + case 'i': + if (!s) + prbufp->interface = fullpath(i); + break; - case 'I': - prbufp->input_types = I; - break; + case 'I': + prbufp->input_types = I; + break; - case 'l': - if (!s) - prbufp->login = 1; - break; + case 'l': + if (!s) + prbufp->login = 1; + break; - case 'L': - if (!s) - prbufp->plen = length_sdn; - break; + case 'L': + if (!s) + prbufp->plen = length_sdn; + break; - case 'm': - if (!s) - prbufp->interface = makepath(Lp_Model, m, (char *)0); - break; + case 'm': + if (!s) + prbufp->interface = makepath(Lp_Model, m, NULL); + break; - case 'M': - if (!s) - prbufp->lpi = lpi_sdn; - break; + case 'M': + if (!s) + prbufp->lpi = lpi_sdn; + break; #ifdef LP_USE_PAPI_ATTR - case 'n': - { - if (n_opt != NULL) - { - if (*n_opt == '/') - { - prbufp->ppd = fullpath(n_opt); - } - else - { - prbufp->ppd = - makepath(Lp_Model, "ppd", n_opt, (char *)0); + case 'n': + if (n_opt != NULL) { + if (*n_opt == '/') { + prbufp->ppd = fullpath(n_opt); + } else { + prbufp->ppd = makepath(Lp_Model, "ppd", + n_opt, NULL); + } + ppdopt = 1; } - ppdopt = 1; - } - break; - } + break; #endif - case 'o': - /* - * The "undefined" key-value -o options - * - * Options requires special handling. It is a - * list whose members are to be handled - * individually. - * - * Need to: set new options, keep old options if not - * redefined, remove old options if defined as "key=". - * - * - * "p" is a global containing the printer name - */ - - if (!s) { + case 'o': + /* + * The "undefined" key-value -o options + * + * Options requires special handling. It is a + * list whose members are to be handled + * individually. + * + * Need to: set new options, keep old options if not + * redefined, remove old options if defined as "key=". + * + * + * "p" is a global containing the printer name + */ - if ((infile_opts = getpentry(p, PR_OPTIONS)) == NULL) - prbufp->options = o_options; - else { - prbufp->options = - pick_opts(infile_opts, o_options); + if (!s) { + if ((infile_opts = + getpentry(p, PR_OPTIONS)) == NULL) { + prbufp->options = o_options; + } else { + prbufp->options = pick_opts(infile_opts, + o_options); + } } - } - break; + break; - case 'R': - if (s) { - prbufp->remote = s; - prbufp->dial_info = 0; - prbufp->device = 0; - } else - prbufp->remote = 0; - break; + case 'R': + if (s) { + prbufp->remote = s; + prbufp->dial_info = 0; + prbufp->device = 0; + } else { + prbufp->remote = 0; + } + break; - case 's': - if (!s) { - /* - * lpadmin always defers to stty - */ - prbufp->speed = 0; - prbufp->stty = stty_opt; - } - break; + case 's': + if (!s) { + /* + * lpadmin always defers to stty + */ + prbufp->speed = 0; + prbufp->stty = stty_opt; + } + break; - case 'S': - if (!M) - if (STREQU(*S, NAME_NONE)) - prbufp->char_sets = 0; - else - prbufp->char_sets = S; - break; + case 'S': + if (!M) + if (STREQU(*S, NAME_NONE)) + prbufp->char_sets = 0; + else + prbufp->char_sets = S; + break; - case 'T': - prbufp->printer_types = T; - break; + case 'T': + prbufp->printer_types = T; + break; - case 'U': - if (!s) { - prbufp->dial_info = U; - prbufp->device = 0; - prbufp->remote = 0; - } - break; + case 'U': + if (!s) { + prbufp->dial_info = U; + prbufp->device = 0; + prbufp->remote = 0; + } + break; - case 'v': - if (!s) { - prbufp->device = v; - prbufp->dial_info = 0; - prbufp->remote = 0; - } - break; + case 'v': + if (!s) { + prbufp->device = v; + prbufp->dial_info = 0; + prbufp->remote = 0; + } + break; - case 'w': - if (!s) - prbufp->pwid = width_sdn; - break; + case 'w': + if (!s) + prbufp->pwid = width_sdn; + break; - case 'W': - if (!s) - prbufp->fault_alert.W = W; - break; + case 'W': + if (!s) + prbufp->fault_alert.W = W; + break; + } } BEGIN_CRITICAL if (putprinter(p, prbufp) == -1) { - if ( - errno == EINVAL - && (badprinter & BAD_INTERFACE) - ) - LP_ERRMSG1 ( - ERROR, - E_ADM_BADINTF, - prbufp->interface - ); + if (errno == EINVAL && (badprinter & BAD_INTERFACE)) + LP_ERRMSG1(ERROR, E_ADM_BADINTF, + prbufp->interface); else - LP_ERRMSG2 ( - ERROR, - E_LP_PUTPRINTER, - p, - PERROR - ); + LP_ERRMSG2(ERROR, E_LP_PUTPRINTER, p, PERROR); done(1); } @@ -643,20 +615,17 @@ static void configure_printer (list) update_dev_dbs(p, prbufp->device, "ADD"); END_CRITICAL - - return; } -/** - ** fullpath() - **/ +/* + * fullpath() + */ -static char *fullpath (str) - char *str; +static char * +fullpath(char *str) { - register char *cur_dir, - *path; - + char *cur_dir; + char *path; while (*str && *str == ' ') str++; @@ -666,7 +635,7 @@ static char *fullpath (str) if (!(cur_dir = malloc(PATH_MAX + 1))) return (str); - getcwd (cur_dir, PATH_MAX); + getcwd(cur_dir, PATH_MAX); path = makepath(cur_dir, str, (char *)0); /* @@ -677,22 +646,22 @@ static char *fullpath (str) return (path); } -/** - ** nameit() - ADD USER NAME TO COMMAND - **/ +/* + * nameit() - ADD USER NAME TO COMMAND + */ -char *nameit (cmd) - char *cmd; +char * +nameit(char *cmd) { - register char *nm = getname(), - *copy = malloc( - (unsigned) (strlen(cmd) + 1 + - strlen(nm) + 1) - ); - - (void) strcpy (copy, cmd); - (void) strcat (copy, " "); - (void) strcat (copy, nm); + char *nm; + char *copy; + + nm = getname(); + copy = malloc(strlen(cmd) + 1 + strlen(nm) + 1); + + (void) strcpy(copy, cmd); + (void) strcat(copy, " "); + (void) strcat(copy, nm); return (copy); } diff --git a/usr/src/cmd/lp/model/netpr/netpr.c b/usr/src/cmd/lp/model/netpr/netpr.c index bdce543aa5..9516781fad 100644 --- a/usr/src/cmd/lp/model/netpr/netpr.c +++ b/usr/src/cmd/lp/model/netpr/netpr.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -76,14 +74,14 @@ net_open(char *host, int timeout) void (*old_handler)(); static struct utsname uts; - int s, - lport, - err, - error_num; + int s; + int lport; + int err; + int error_num; unsigned timo = 1; syslog(LOG_DEBUG, "net_open(%s, %d)", (host != NULL ? host : "NULL"), - timeout); + timeout); /* * Get the host address and port number to connect to. */ @@ -93,7 +91,7 @@ net_open(char *host, int timeout) (void) memset((char *)&sin, NULL, sizeof (sin)); if ((hp = getipnodebyname(host, AF_INET6, AI_DEFAULT, - &error_num)) == NULL) { + &error_num)) == NULL) { syslog(LOG_DEBUG|LOG_ERR, "unknown host %s " "getipnodebyname() returned %d", host, error_num); return (NETWORK_ERROR_HOST); @@ -205,27 +203,23 @@ main(int argc, char *argv[]) case 'I': /* foo-49 */ job_data->request_id = alloc_str((char *)optarg); syslog(LOG_DEBUG, "request_id: %s", - job_data->request_id); + job_data->request_id); break; case 'U': /* awe172-126!wendyp */ job_data->username = alloc_str((char *)optarg); - syslog(LOG_DEBUG, "username: %s", - job_data->username); + syslog(LOG_DEBUG, "username: %s", job_data->username); break; case 'p': /* foo */ job_data->printer = alloc_str((char *)optarg); - syslog(LOG_DEBUG, "printer: %s", - job_data->printer); + syslog(LOG_DEBUG, "printer: %s", job_data->printer); break; case 'd': /* server for printer */ job_data->dest = alloc_str((char *)optarg); - syslog(LOG_DEBUG, "dest: %s", - job_data->dest); + syslog(LOG_DEBUG, "dest: %s", job_data->dest); break; case 'T': /* /tmp/file2 */ job_data->title = alloc_str((char *)optarg); - syslog(LOG_DEBUG, "title: %s", - job_data->title); + syslog(LOG_DEBUG, "title: %s", job_data->title); break; case 'P': if ((strcmp(optarg, "bsd")) == 0) @@ -235,8 +229,7 @@ main(int argc, char *argv[]) else usage_exit(); - syslog(LOG_DEBUG, "protocol: %d", - job_data->protocol); + syslog(LOG_DEBUG, "protocol: %d", job_data->protocol); break; case 't': job_data->timeout = atoi(optarg); @@ -255,8 +248,7 @@ main(int argc, char *argv[]) break; case 'b': job_data->banner = NOBANNER; - syslog(LOG_DEBUG, "banner : %d", - job_data->banner); + syslog(LOG_DEBUG, "banner : %d", job_data->banner); break; case '?': usage_exit(); @@ -264,7 +256,7 @@ main(int argc, char *argv[]) if ((job_data->dest == NULL) || (job_data->request_id == NULL) || - (job_data->printer == NULL) || (job_data->username == NULL)) + (job_data->printer == NULL) || (job_data->username == NULL)) usage_exit(); /* @@ -285,26 +277,30 @@ main(int argc, char *argv[]) if ((filesize = check_file(job_data->filename)) == -1) { syslog(LOG_DEBUG, "Skipping file %s", - job_data->filename ? job_data->filename : "Error NULL file"); + job_data->filename ? + job_data->filename : "Error NULL file"); switch (errno) { case EISDIR: (void) fprintf(stderr, - gettext("Netpr: %s: Not a regular file\n"), - (job_data->filename ? job_data->filename : "Noname")); + gettext("Netpr: %s: Not a regular file\n"), + job_data->filename ? + job_data->filename : "Noname"); syslog(LOG_DEBUG, "Not a regular file"); break; case ESRCH: (void) fprintf(stderr, - gettext("Netpr: %s: Empty file\n"), - (job_data->filename ? job_data->filename : "Noname")); + gettext("Netpr: %s: Empty file\n"), + job_data->filename ? + job_data->filename : "Noname"); syslog(LOG_DEBUG, "Empty file"); break; default: perror(job_data->filename); (void) fprintf(stderr, - gettext("Netpr: Cannot access file %s\n"), - (job_data->filename ? job_data->filename : "Noname")); + gettext("Netpr: Cannot access file %s\n"), + job_data->filename ? + job_data->filename : "Noname"); syslog(LOG_DEBUG, "Cannot access file."); break; @@ -322,21 +318,25 @@ main(int argc, char *argv[]) */ if ((fd = open(job_data->filename, O_RDONLY)) < 0) { (void) fprintf(stderr, gettext("Netpr: Cannot open file %s\n"), - (job_data->filename ? job_data->filename : "Error: NULL file")); + job_data->filename ? + job_data->filename : "Error: NULL file"); syslog(LOG_DEBUG, "Cannot open file: %s", - job_data->filename ? job_data->filename : "Error NULL file"); + job_data->filename ? + job_data->filename : "Error NULL file"); exit(E_BAD_FILE); } if ((pa = mmap((caddr_t)0, filesize, PROT_READ, - (MAP_SHARED | MAP_NORESERVE), fd, (off_t)0)) == MAP_FAILED) { + (MAP_SHARED | MAP_NORESERVE), fd, (off_t)0)) == MAP_FAILED) { (void) close(fd); (void) fprintf(stderr, gettext("Netpr: Cannot mmap file %s"), - (job_data->filename ? job_data->filename : "Error: NULL file")); + job_data->filename ? + job_data->filename : "Error: NULL file"); syslog(LOG_DEBUG, "Cannot mmap file: %s", - job_data->filename ? job_data->filename : "Error NULL file"); + job_data->filename ? + job_data->filename : "Error NULL file"); exit(E_RETRY); } @@ -344,7 +344,7 @@ main(int argc, char *argv[]) if (job_data->protocol == BSD) { bsdjob = (np_bsdjob_t *) - create_bsd_job(job_data, pr_order, filesize); + create_bsd_job(job_data, pr_order, filesize); if (bsdjob == NULL) exit(E_FAILURE); } else { @@ -360,29 +360,27 @@ main(int argc, char *argv[]) if ((strpbrk(job_data->dest, DEST_SEP)) != NULL) { if (job_data->protocol == BSD) { parse_dest(job_data->dest, &destination, - &vendor_pr_name, DEST_SEP); + &vendor_pr_name, DEST_SEP); if (vendor_pr_name != NULL) { bsdjob->np_printer = vendor_pr_name; syslog(LOG_DEBUG, "bsd vendor name: %s", - bsdjob->np_printer); + bsdjob->np_printer); } } else { parse_dest(job_data->dest, &destination, &tcp_port, - DEST_SEP); + DEST_SEP); if (tcp_port != NULL) tcpjob->np_port = tcp_port; - syslog(LOG_DEBUG, "tcp_port %s", - tcpjob->np_port); + syslog(LOG_DEBUG, "tcp_port %s", tcpjob->np_port); } if (destination == NULL || - (job_data->protocol == TCP && tcp_port == NULL)) { - (void) fprintf(stderr, - gettext("Netpr: system error parsing destination %s\n"), - job_data->dest); - syslog(LOG_DEBUG, "system error parsing destination %s", - job_data->dest); - - exit(E_FAILURE); + (job_data->protocol == TCP && tcp_port == NULL)) { + (void) fprintf(stderr, gettext("Netpr: system error " + "parsing destination %s\n"), job_data->dest); + syslog(LOG_DEBUG, "system error parsing destination %s", + job_data->dest); + + exit(E_FAILURE); } } else { @@ -406,9 +404,9 @@ main(int argc, char *argv[]) (void) fprintf(stderr, gettext("Netpr: Cannot open connection to <%s>\n"), destination); - syslog(LOG_DEBUG, - "Cannot open connection to %s: retrying", - destination); + syslog(LOG_DEBUG, + "Cannot open connection to %s: retrying", + destination); exit(E_RETRY); } } else { @@ -426,27 +424,25 @@ main(int argc, char *argv[]) /* Set SO_KEEPALIVE on socket to keep open */ if ((setsockopt(sockfd, SOL_SOCKET, SO_KEEPALIVE, - (char *)&on, sizeof (on))) < 0) { + (char *)&on, sizeof (on))) < 0) { syslog(LOG_DEBUG, "setsocket (SO_KEEPALIVE): %m"); } if (job_data->protocol == BSD) { if ((jobstatus = bsd_print(sockfd, pa, bsdjob)) != 0) { - (void) fprintf(stderr, - gettext("Netpr: Error return from bsd_print <%d>\n"), - jobstatus); + (void) fprintf(stderr, gettext("Netpr: Error return " + "from bsd_print <%d>\n"), jobstatus); syslog(LOG_DEBUG, - "Error return from bsd_print <%d>", jobstatus); + "Error return from bsd_print <%d>", jobstatus); exit_status = E_RETRY; } } else { if ((jobstatus = - tcp_print(sockfd, pa, tcpjob)) != 0) { - (void) fprintf(stderr, - gettext("Netpr: Error return from tcp_print <%d>\n"), - jobstatus); + tcp_print(sockfd, pa, tcpjob)) != 0) { + (void) fprintf(stderr, gettext("Netpr: Error return " + "from tcp_print <%d>\n"), jobstatus); syslog(LOG_DEBUG, - "Error return from tcp_print <%d>", jobstatus); + "Error return from tcp_print <%d>", jobstatus); exit_status = E_RETRY; } } -- 2.11.4.GIT