werror: replace WERR_INVALID_PARAM with WERR_INVALID_PARAMETER in source3/printing/
authorGünther Deschner <gd@samba.org>
Thu, 3 Dec 2015 14:24:24 +0000 (15:24 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 27 Sep 2016 22:04:22 +0000 (00:04 +0200)
Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/printing/nt_printing.c
source3/printing/printing.c

index c18db0453b114a5846c5c473a6a6238b224310b6..248193c389a2415dc9794dfb07aa48feb6ea9488 100644 (file)
@@ -678,7 +678,7 @@ static uint32_t get_correct_cversion(struct auth_session_info *session_info,
        char *printdollar = NULL;
        int printdollar_snum;
 
-       *perr = WERR_INVALID_PARAM;
+       *perr = WERR_INVALID_PARAMETER;
 
        /* If architecture is Windows 95/98/ME, the version is always 0. */
        if (strcmp(architecture, SPL_ARCH_WIN40) == 0) {
@@ -787,13 +787,13 @@ static uint32_t get_correct_cversion(struct auth_session_info *session_info,
 
                ret = get_file_version(fsp, smb_fname->base_name, &major, &minor);
                if (ret == -1) {
-                       *perr = WERR_INVALID_PARAM;
+                       *perr = WERR_INVALID_PARAMETER;
                        goto error_exit;
                } else if (!ret) {
                        DEBUG(6,("get_correct_cversion: Version info not "
                                 "found [%s]\n",
                                 smb_fname_str_dbg(smb_fname)));
-                       *perr = WERR_INVALID_PARAM;
+                       *perr = WERR_INVALID_PARAMETER;
                        goto error_exit;
                }
 
@@ -872,11 +872,11 @@ static WERROR clean_up_driver_struct_level(TALLOC_CTX *mem_ctx,
        char *_p;
 
        if (!*driver_path || !*data_file) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        if (!strequal(architecture, SPOOLSS_ARCHITECTURE_4_0) && !*config_file) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        /* clean up the driver name.
index e7e6c6dbf71039f7ecc762739ebd63a28e0a5881..c6c42f3b0b134233318c5497221293ac36909b7d 100644 (file)
@@ -2345,14 +2345,14 @@ WERROR print_job_pause(const struct auth_session_info *server_info,
        if (!pjob || !server_info) {
                DEBUG(10, ("print_job_pause: no pjob or user for jobid %u\n",
                        (unsigned int)jobid ));
-               werr = WERR_INVALID_PARAM;
+               werr = WERR_INVALID_PARAMETER;
                goto err_out;
        }
 
        if (!pjob->spooled || pjob->sysjob == -1) {
                DEBUG(10, ("print_job_pause: not spooled or bad sysjob = %d for jobid %u\n",
                        (int)pjob->sysjob, (unsigned int)jobid ));
-               werr = WERR_INVALID_PARAM;
+               werr = WERR_INVALID_PARAMETER;
                goto err_out;
        }
 
@@ -2372,7 +2372,7 @@ WERROR print_job_pause(const struct auth_session_info *server_info,
        ret = (*(current_printif->job_pause))(snum, pjob);
 
        if (ret != 0) {
-               werr = WERR_INVALID_PARAM;
+               werr = WERR_INVALID_PARAMETER;
                goto err_out;
        }
 
@@ -2412,14 +2412,14 @@ WERROR print_job_resume(const struct auth_session_info *server_info,
        if (!pjob || !server_info) {
                DEBUG(10, ("print_job_resume: no pjob or user for jobid %u\n",
                        (unsigned int)jobid ));
-               werr = WERR_INVALID_PARAM;
+               werr = WERR_INVALID_PARAMETER;
                goto err_out;
        }
 
        if (!pjob->spooled || pjob->sysjob == -1) {
                DEBUG(10, ("print_job_resume: not spooled or bad sysjob = %d for jobid %u\n",
                        (int)pjob->sysjob, (unsigned int)jobid ));
-               werr = WERR_INVALID_PARAM;
+               werr = WERR_INVALID_PARAMETER;
                goto err_out;
        }
 
@@ -2438,7 +2438,7 @@ WERROR print_job_resume(const struct auth_session_info *server_info,
        ret = (*(current_printif->job_resume))(snum, pjob);
 
        if (ret != 0) {
-               werr = WERR_INVALID_PARAM;
+               werr = WERR_INVALID_PARAMETER;
                goto err_out;
        }
 
@@ -3330,7 +3330,7 @@ WERROR print_queue_pause(const struct auth_session_info *server_info,
        unbecome_root();
 
        if (ret != 0) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        /* force update the database */
@@ -3366,7 +3366,7 @@ WERROR print_queue_resume(const struct auth_session_info *server_info,
        unbecome_root();
 
        if (ret != 0) {
-               return WERR_INVALID_PARAM;
+               return WERR_INVALID_PARAMETER;
        }
 
        /* make sure the database is up to date */