Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 864950 Details for
Bug 909351
net-print/hplip-3.23.3 fails to build with clang-16.0.5: prnt/hpcups/ModeDeltaPlus.cpp:244:5: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
0001-remove-deprecated-register-keyword.patch
0001-remove-deprecated-register-keyword.patch (text/plain), 23.49 KB, created by
David Carlos Manuelda
on 2023-07-01 14:00:35 UTC
(
hide
)
Description:
0001-remove-deprecated-register-keyword.patch
Filename:
MIME Type:
Creator:
David Carlos Manuelda
Created:
2023-07-01 14:00:35 UTC
Size:
23.49 KB
patch
obsolete
>From c69bce310281632c03160c926ab563179c2ea5ce Mon Sep 17 00:00:00 2001 >From: "David C. Manuelda" <StormByte@gmail.com> >Date: Sat, 1 Jul 2023 15:37:13 +0200 >Subject: [PATCH] Remove deprecated register keyword > >--- > fax/filters/cdmfax/jetlib.cpp | 8 ++--- > io/hpmud/model.c | 4 +-- > io/hpmud/musb.c | 6 ++-- > io/hpmud/musb_libusb01.c | 6 ++-- > ip/xjpg_dct.c | 4 +-- > ip/xjpg_dct.h | 4 +-- > prnt/backend/hp.c | 2 +- > prnt/hpcups/Mode9.cpp | 2 +- > prnt/hpcups/ModeDeltaPlus.cpp | 4 +-- > prnt/hpcups/jccolor.c | 46 ++++++++++++------------ > prnt/hpijs/compression.cpp | 2 +- > prnt/hpijs/dj850.cpp | 2 +- > prnt/hpijs/dj8xx.cpp | 2 +- > prnt/hpijs/foomatic-rip-hplip | 6 ++-- > prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch | 6 ++-- > prnt/hpijs/jccolor.c | 46 ++++++++++++------------ > prnt/hpijs/ljcolor.cpp | 2 +- > prnt/hpijs/ljfastraster.cpp | 6 ++-- > prnt/hpijs/ljjetready.cpp | 2 +- > prnt/hpijs/printer.cpp | 2 +- > prnt/hpijs/printerfactory.cpp | 4 +-- > prnt/hpijs/systemservices.h | 4 +-- > prnt/hpps/psutil.c | 6 ++-- > protocol/discovery/avahiDiscovery.c | 2 +- > 24 files changed, 89 insertions(+), 89 deletions(-) > >diff --git a/fax/filters/cdmfax/jetlib.cpp b/fax/filters/cdmfax/jetlib.cpp >index 12538ea..036934a 100755 >--- a/fax/filters/cdmfax/jetlib.cpp >+++ b/fax/filters/cdmfax/jetlib.cpp >@@ -7568,8 +7568,8 @@ HP_StdFuncPrefix HP_M2TIFF_CalcCompression( > HP_pCharHuge lpfirst; > HP_pCharHuge lpchar; > HP_BOOL in_run, FourByteWordPad; >- register HP_UByte count; >- register HP_SInt16 state; >+ HP_UByte count; >+ HP_SInt16 state; > HP_UByte padCount; > HP_pUByte lpEnd; > >@@ -7704,8 +7704,8 @@ HP_StdFuncPrefix HP_M2TIFF_Compress( > HP_pCharHuge lpfirst; > HP_pCharHuge lpchar; > HP_BOOL in_run,FourByteWordPad; >- register HP_UByte count; >- register HP_SInt16 state; >+ HP_UByte count; >+ HP_SInt16 state; > HP_pCharHuge lpEnd; > HP_UByte padCount; > >diff --git a/io/hpmud/model.c b/io/hpmud/model.c >index 4ea8990..0557a5b 100644 >--- a/io/hpmud/model.c >+++ b/io/hpmud/model.c >@@ -531,7 +531,7 @@ enum HPMUD_RESULT hpmud_get_model_attributes(char *uri, char *attr, int attrSize > { > BUG("no %s attributes found in %s\n", model, sz); > >- DelList(); /* Unregister all labels. */ >+ DelList(); /* Unall labels. */ > > /* Search /data/models/unreleased/unreleased.dat file for specified model. */ > snprintf(sz, sizeof(sz), "%s/data/models/unreleased/unreleased.dat", homedir); >@@ -547,7 +547,7 @@ enum HPMUD_RESULT hpmud_get_model_attributes(char *uri, char *attr, int attrSize > stat = HPMUD_R_OK; > > bugout: >- DelList(); /* Unregister all labels. */ >+ DelList(); /* Unall labels. */ > return stat; > } > >diff --git a/io/hpmud/musb.c b/io/hpmud/musb.c >index 2aa8a54..396bf37 100644 >--- a/io/hpmud/musb.c >+++ b/io/hpmud/musb.c >@@ -235,7 +235,7 @@ static int bridge_chip_up(file_descriptor *pfd) > > memset(buf, 0, sizeof(buf)); > >- /* Read register values. */ >+ /* Read values. */ > len = libusb_control_transfer(hd, > LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE, /* bmRequestType */ > LIBUSB_REQUEST_SET_FEATURE, /* bRequest */ >@@ -251,7 +251,7 @@ static int bridge_chip_up(file_descriptor *pfd) > /* Check for auto ECP mode. */ > if (buf[ECRR] != 0x43) > { >- /* Place 725 chip in register mode. */ >+ /* Place 725 chip in mode. */ > len = libusb_control_transfer(hd, > LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE, /* bmRequestType */ > 0x04, /* bRequest */ >@@ -279,7 +279,7 @@ static int bridge_chip_up(file_descriptor *pfd) > 0x0817, /* wValue */ > 0, /* wIndex */ > NULL, 0, LIBUSB_CONTROL_REQ_TIMEOUT); >- /* Read register values. */ >+ /* Read values. */ > len = libusb_control_transfer(hd, > LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_RECIPIENT_DEVICE, /* bmRequestType */ > LIBUSB_REQUEST_SET_FEATURE, /* bRequest */ >diff --git a/io/hpmud/musb_libusb01.c b/io/hpmud/musb_libusb01.c >index 1967802..9e299e0 100644 >--- a/io/hpmud/musb_libusb01.c >+++ b/io/hpmud/musb_libusb01.c >@@ -273,7 +273,7 @@ static int bridge_chip_up(file_descriptor *pfd) > > memset(buf, 0, sizeof(buf)); > >- /* Read register values. */ >+ /* Read values. */ > len = usb_control_msg(hd, > USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, /* bmRequestType */ > USB_REQ_SET_FEATURE, /* bRequest */ >@@ -289,7 +289,7 @@ static int bridge_chip_up(file_descriptor *pfd) > /* Check for auto ECP mode. */ > if (buf[ECRR] != 0x43) > { >- /* Place 725 chip in register mode. */ >+ /* Place 725 chip in mode. */ > len = usb_control_msg(hd, > USB_ENDPOINT_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, /* bmRequestType */ > 0x04, /* bRequest */ >@@ -317,7 +317,7 @@ static int bridge_chip_up(file_descriptor *pfd) > 0x0817, /* wValue */ > 0, /* wIndex */ > NULL, 0, LIBUSB_CONTROL_REQ_TIMEOUT); >- /* Read register values. */ >+ /* Read values. */ > len = usb_control_msg(hd, > USB_ENDPOINT_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, /* bmRequestType */ > USB_REQ_SET_FEATURE, /* bRequest */ >diff --git a/ip/xjpg_dct.c b/ip/xjpg_dct.c >index 63f021b..1986923 100644 >--- a/ip/xjpg_dct.c >+++ b/ip/xjpg_dct.c >@@ -103,7 +103,7 @@ > | for the Winograd DCT. | > |____________________________________________________________________________| > */ >-void dct_forward (register int *block_p) >+void dct_forward (int *block_p) > { > #define CONST_FRAC_BITS 14 /* bits of frac in CONST_1-CONST_5 below */ > >@@ -257,7 +257,7 @@ void dct_forward (register int *block_p) > | and level-shifting, you must clamp these values to 0..255. | > |____________________________________________________________________________| > */ >-void dct_inverse (register int *block_p) >+void dct_inverse (int *block_p) > { > #define CONST_FRAC_BITS 13 /* bits of frac in CONST_1-CONST_5 below */ > >diff --git a/ip/xjpg_dct.h b/ip/xjpg_dct.h >index 7dc90f3..149d66f 100644 >--- a/ip/xjpg_dct.h >+++ b/ip/xjpg_dct.h >@@ -43,8 +43,8 @@ > |____________________________________________________________________________| > */ > >-void dct_forward (register int *block_p); >+void dct_forward (int *block_p); > >-void dct_inverse (register int *block_p); >+void dct_inverse (int *block_p); > > /* End of File */ >diff --git a/prnt/backend/hp.c b/prnt/backend/hp.c >index 07713b2..b0f300d 100644 >--- a/prnt/backend/hp.c >+++ b/prnt/backend/hp.c >@@ -427,7 +427,7 @@ static int get_printer_status(HPMUD_DEVICE dd, HPMUD_CHANNEL cd, struct pjl_attr > /* Check for valid S-field in device id string. */ > if ((pSf = strstr(id, ";S:")) == NULL) > { >- /* No S-field, use status register instead of device id. */ >+ /* No S-field, use status instead of device id. */ > unsigned int bit_status; > r = hpmud_get_device_status(dd, &bit_status); > // if (!(r == HPMUD_R_OK || r == HPMUD_R_DEVICE_BUSY)) >diff --git a/prnt/hpcups/Mode9.cpp b/prnt/hpcups/Mode9.cpp >index 94ff571..6cc210a 100644 >--- a/prnt/hpcups/Mode9.cpp >+++ b/prnt/hpcups/Mode9.cpp >@@ -203,7 +203,7 @@ bool Mode9::Process(RASTERDATA* input) > unsigned int offset,byte_count,rem_count; > Mode9_comtype command; > char* dest= (char*) compressBuf; >- register char *dptr=dest; >+ char *dptr=dest; > > while ( size > 0 ) > { >diff --git a/prnt/hpcups/ModeDeltaPlus.cpp b/prnt/hpcups/ModeDeltaPlus.cpp >index 4552f4a..2b897c4 100644 >--- a/prnt/hpcups/ModeDeltaPlus.cpp >+++ b/prnt/hpcups/ModeDeltaPlus.cpp >@@ -241,8 +241,8 @@ bool ModeDeltaPlus::compress (BYTE *outmem, > const uint32_t inheight, > uint32_t horz_ht_dist) > { >- register BYTE *outptr = outmem; >- register uint32_t col; >+ BYTE *outptr = outmem; >+ uint32_t col; > const BYTE *seedrow; > uint32_t seedrow_count = 0; > uint32_t location = 0; >diff --git a/prnt/hpcups/jccolor.c b/prnt/hpcups/jccolor.c >index 7cc8906..6794575 100644 >--- a/prnt/hpcups/jccolor.c >+++ b/prnt/hpcups/jccolor.c >@@ -73,7 +73,7 @@ typedef my_color_converter * my_cconvert_ptr; > > /* We allocate one big table and divide it up into eight parts, instead of > * doing eight alloc_small requests. This lets us use a single table base >- * address, which can be held in a register in the inner loops on many >+ * address, which can be held in a in the inner loops on many > * machines (more than can hold all eight addresses, anyway). > */ > >@@ -205,11 +205,11 @@ rgb_ycc_convert (j_compress_ptr cinfo, > JDIMENSION output_row, int num_rows) > { > my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; >- register int r, g, b; >- register INT32 * ctab = cconvert->rgb_ycc_tab; >- register JSAMPROW inptr; >- register JSAMPROW outptr0, outptr1, outptr2; >- register JDIMENSION col; >+ int r, g, b; >+ INT32 * ctab = cconvert->rgb_ycc_tab; >+ JSAMPROW inptr; >+ JSAMPROW outptr0, outptr1, outptr2; >+ JDIMENSION col; > JDIMENSION num_cols = cinfo->image_width; > > while (--num_rows >= 0) { >@@ -261,11 +261,11 @@ rgb_gray_convert (j_compress_ptr cinfo, > JDIMENSION output_row, int num_rows) > { > my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; >- register int r, g, b; >- register INT32 * ctab = cconvert->rgb_ycc_tab; >- register JSAMPROW inptr; >- register JSAMPROW outptr; >- register JDIMENSION col; >+ int r, g, b; >+ INT32 * ctab = cconvert->rgb_ycc_tab; >+ JSAMPROW inptr; >+ JSAMPROW outptr; >+ JDIMENSION col; > JDIMENSION num_cols = cinfo->image_width; > > while (--num_rows >= 0) { >@@ -300,11 +300,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo, > JDIMENSION output_row, int num_rows) > { > my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; >- register int r, g, b; >- register INT32 * ctab = cconvert->rgb_ycc_tab; >- register JSAMPROW inptr; >- register JSAMPROW outptr0, outptr1, outptr2, outptr3; >- register JDIMENSION col; >+ int r, g, b; >+ INT32 * ctab = cconvert->rgb_ycc_tab; >+ JSAMPROW inptr; >+ JSAMPROW outptr0, outptr1, outptr2, outptr3; >+ JDIMENSION col; > JDIMENSION num_cols = cinfo->image_width; > > while (--num_rows >= 0) { >@@ -354,9 +354,9 @@ grayscale_convert (j_compress_ptr cinfo, > JSAMPARRAY input_buf, JSAMPIMAGE output_buf, > JDIMENSION output_row, int num_rows) > { >- register JSAMPROW inptr; >- register JSAMPROW outptr; >- register JDIMENSION col; >+ JSAMPROW inptr; >+ JSAMPROW outptr; >+ JDIMENSION col; > JDIMENSION num_cols = cinfo->image_width; > int instride = cinfo->input_components; > >@@ -383,10 +383,10 @@ null_convert (j_compress_ptr cinfo, > JSAMPARRAY input_buf, JSAMPIMAGE output_buf, > JDIMENSION output_row, int num_rows) > { >- register JSAMPROW inptr; >- register JSAMPROW outptr; >- register JDIMENSION col; >- register int ci; >+ JSAMPROW inptr; >+ JSAMPROW outptr; >+ JDIMENSION col; >+ int ci; > int nc = cinfo->num_components; > JDIMENSION num_cols = cinfo->image_width; > >diff --git a/prnt/hpijs/compression.cpp b/prnt/hpijs/compression.cpp >index fcac793..10194ca 100644 >--- a/prnt/hpijs/compression.cpp >+++ b/prnt/hpijs/compression.cpp >@@ -266,7 +266,7 @@ BOOL Mode9::Process(RASTERDATA* input) > unsigned int offset,byte_count,rem_count; > Mode9_comtype command; > char* dest= (char*) compressBuf; >- register char *dptr=dest; >+ char *dptr=dest; > > while ( size > 0 ) > { >diff --git a/prnt/hpijs/dj850.cpp b/prnt/hpijs/dj850.cpp >index 4b16b67..643b163 100644 >--- a/prnt/hpijs/dj850.cpp >+++ b/prnt/hpijs/dj850.cpp >@@ -301,7 +301,7 @@ BOOL DJ850::UseGUIMode(PrintMode* pPrintMode) > * Called by: Send() > * > * Parameters on entry: status_reg is the contents of the centronics >- * status register (at the time the error was >+ * status (at the time the error was > * detected) > * > * Parameters on exit: unchanged >diff --git a/prnt/hpijs/dj8xx.cpp b/prnt/hpijs/dj8xx.cpp >index b8209cb..7225d97 100644 >--- a/prnt/hpijs/dj8xx.cpp >+++ b/prnt/hpijs/dj8xx.cpp >@@ -443,7 +443,7 @@ DRIVER_ERROR DJ8xx::CleanPen() > * Called by: Send() > * > * Parameters on entry: status_reg is the contents of the centronics >- * status register (at the time the error was >+ * status (at the time the error was > * detected) > * > * Parameters on exit: unchanged >diff --git a/prnt/hpijs/foomatic-rip-hplip b/prnt/hpijs/foomatic-rip-hplip >index dc23519..3cfcba1 100644 >--- a/prnt/hpijs/foomatic-rip-hplip >+++ b/prnt/hpijs/foomatic-rip-hplip >@@ -181,7 +181,7 @@ my $EXIT_INCAPABLE = 50; # printer wants (lacks) features > > my $ESPIPE = 29; # the errno value when seeking a pipe or socket > >-# The modern_shell() function will register the PIDs of all shell calls, >+# The modern_shell() function will the PIDs of all shell calls, > # so that rip_die() can kill these processes > my %pids; > >@@ -6725,8 +6725,8 @@ sub modern_system { > exec($modern_shell, "-c", @list); > rip_die("exec($modern_shell, \"-c\", @list);", > $EXIT_PRNERR_NORETRY_BAD_SETTINGS); >- } else { # parent, register child's PID, wait for the child, and >- # unregister the PID >+ } else { # parent, child's PID, wait for the child, and >+ # unthe PID > $pids{$pid} = substr(join(" ", @list), 0, 100) . > (length(join(" ", @list)) > 100 ? "..." : ""); > print $logh "Starting process $pid: \"$pids{$pid}\"\n"; >diff --git a/prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch b/prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch >index eb55acf..7ffade8 100644 >--- a/prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch >+++ b/prnt/hpijs/gdevijs-krgb-1.5-gs8.61.patch >@@ -132,7 +132,7 @@ diff -uNr old/gdevijs.c new/gdevijs.c > + if (ijsdev->krgb_mode && ijsdev->k_path && y >= 0 && x >= 0) > + { > + int raster = (ijsdev->k_width+7) >> 3; >-+ register unsigned char *dest; >++ unsigned char *dest; > + int dest_start_bit; > + int band_height = ijsdev->k_band_size/raster; > + int i,j; >@@ -200,8 +200,8 @@ diff -uNr old/gdevijs.c new/gdevijs.c > + { > + /* Store in k plane band instead of regular band. */ > + int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */ >-+ register unsigned char *dest; >-+ register const unsigned char *scan; >++ unsigned char *dest; >++ const unsigned char *scan; > + int dest_start_bit; > + int scan_start_bit; > + int band_height = ijsdev->k_band_size/raster; >diff --git a/prnt/hpijs/jccolor.c b/prnt/hpijs/jccolor.c >index a6b2333..5ca669b 100644 >--- a/prnt/hpijs/jccolor.c >+++ b/prnt/hpijs/jccolor.c >@@ -74,7 +74,7 @@ typedef my_color_converter * my_cconvert_ptr; > > /* We allocate one big table and divide it up into eight parts, instead of > * doing eight alloc_small requests. This lets us use a single table base >- * address, which can be held in a register in the inner loops on many >+ * address, which can be held in a in the inner loops on many > * machines (more than can hold all eight addresses, anyway). > */ > >@@ -206,11 +206,11 @@ rgb_ycc_convert (j_compress_ptr cinfo, > JDIMENSION output_row, int num_rows) > { > my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; >- register int r, g, b; >- register INT32 * ctab = cconvert->rgb_ycc_tab; >- register JSAMPROW inptr; >- register JSAMPROW outptr0, outptr1, outptr2; >- register JDIMENSION col; >+ int r, g, b; >+ INT32 * ctab = cconvert->rgb_ycc_tab; >+ JSAMPROW inptr; >+ JSAMPROW outptr0, outptr1, outptr2; >+ JDIMENSION col; > JDIMENSION num_cols = cinfo->image_width; > > while (--num_rows >= 0) { >@@ -262,11 +262,11 @@ rgb_gray_convert (j_compress_ptr cinfo, > JDIMENSION output_row, int num_rows) > { > my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; >- register int r, g, b; >- register INT32 * ctab = cconvert->rgb_ycc_tab; >- register JSAMPROW inptr; >- register JSAMPROW outptr; >- register JDIMENSION col; >+ int r, g, b; >+ INT32 * ctab = cconvert->rgb_ycc_tab; >+ JSAMPROW inptr; >+ JSAMPROW outptr; >+ JDIMENSION col; > JDIMENSION num_cols = cinfo->image_width; > > while (--num_rows >= 0) { >@@ -301,11 +301,11 @@ cmyk_ycck_convert (j_compress_ptr cinfo, > JDIMENSION output_row, int num_rows) > { > my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; >- register int r, g, b; >- register INT32 * ctab = cconvert->rgb_ycc_tab; >- register JSAMPROW inptr; >- register JSAMPROW outptr0, outptr1, outptr2, outptr3; >- register JDIMENSION col; >+ int r, g, b; >+ INT32 * ctab = cconvert->rgb_ycc_tab; >+ JSAMPROW inptr; >+ JSAMPROW outptr0, outptr1, outptr2, outptr3; >+ JDIMENSION col; > JDIMENSION num_cols = cinfo->image_width; > > while (--num_rows >= 0) { >@@ -355,9 +355,9 @@ grayscale_convert (j_compress_ptr cinfo, > JSAMPARRAY input_buf, JSAMPIMAGE output_buf, > JDIMENSION output_row, int num_rows) > { >- register JSAMPROW inptr; >- register JSAMPROW outptr; >- register JDIMENSION col; >+ JSAMPROW inptr; >+ JSAMPROW outptr; >+ JDIMENSION col; > JDIMENSION num_cols = cinfo->image_width; > int instride = cinfo->input_components; > >@@ -384,10 +384,10 @@ null_convert (j_compress_ptr cinfo, > JSAMPARRAY input_buf, JSAMPIMAGE output_buf, > JDIMENSION output_row, int num_rows) > { >- register JSAMPROW inptr; >- register JSAMPROW outptr; >- register JDIMENSION col; >- register int ci; >+ JSAMPROW inptr; >+ JSAMPROW outptr; >+ JDIMENSION col; >+ int ci; > int nc = cinfo->num_components; > JDIMENSION num_cols = cinfo->image_width; > >diff --git a/prnt/hpijs/ljcolor.cpp b/prnt/hpijs/ljcolor.cpp >index 0ecbfc6..a35d1d6 100644 >--- a/prnt/hpijs/ljcolor.cpp >+++ b/prnt/hpijs/ljcolor.cpp >@@ -546,7 +546,7 @@ Compressor* LJColor::CreateCompressor (unsigned int RasterSize) > * Called by: Send() > * > * Parameters on entry: status_reg is the contents of the centronics >- * status register (at the time the error was >+ * status (at the time the error was > * detected) > * > * Parameters on exit: unchanged >diff --git a/prnt/hpijs/ljfastraster.cpp b/prnt/hpijs/ljfastraster.cpp >index 8c7073a..b6a440e 100644 >--- a/prnt/hpijs/ljfastraster.cpp >+++ b/prnt/hpijs/ljfastraster.cpp >@@ -568,7 +568,7 @@ Compressor* LJFastRaster::CreateCompressor (unsigned int RasterSize) > * Called by: Send() > * > * Parameters on entry: status_reg is the contents of the centronics >- * status register (at the time the error was >+ * status (at the time the error was > * detected) > * > * Parameters on exit: unchanged >@@ -919,8 +919,8 @@ BOOL ModeDeltaPlus::Compress (HPUInt8 *outmem, > const uint32_t inheight, > uint32_t horz_ht_dist) > { >- register HPUInt8 *outptr = outmem; >- register uint32_t col; >+ HPUInt8 *outptr = outmem; >+ uint32_t col; > const HPUInt8 *seedrow; > uint32_t seedrow_count = 0; > uint32_t location = 0; >diff --git a/prnt/hpijs/ljjetready.cpp b/prnt/hpijs/ljjetready.cpp >index 6942d29..91666e3 100644 >--- a/prnt/hpijs/ljjetready.cpp >+++ b/prnt/hpijs/ljjetready.cpp >@@ -821,7 +821,7 @@ Compressor* LJJetReady::CreateCompressor (unsigned int RasterSize) > * Called by: Send() > * > * Parameters on entry: status_reg is the contents of the centronics >- * status register (at the time the error was >+ * status (at the time the error was > * detected) > * > * Parameters on exit: unchanged >diff --git a/prnt/hpijs/printer.cpp b/prnt/hpijs/printer.cpp >index d61ecf5..30723b5 100644 >--- a/prnt/hpijs/printer.cpp >+++ b/prnt/hpijs/printer.cpp >@@ -267,7 +267,7 @@ DRIVER_ERROR Printer::Flush > * Called by: Send() > * > * Parameters on entry: status_reg is the contents of the centronics >- * status register (at the time the error was >+ * status (at the time the error was > * detected) > * > * Parameters on exit: unchanged >diff --git a/prnt/hpijs/printerfactory.cpp b/prnt/hpijs/printerfactory.cpp >index 765ed29..6d147df 100644 >--- a/prnt/hpijs/printerfactory.cpp >+++ b/prnt/hpijs/printerfactory.cpp >@@ -80,7 +80,7 @@ PrinterFactory::~PrinterFactory > //! Register proxy classes for printer families > /*! > This method is used by the constuctor of the PrinterProxy subclasses to >-register themselves with the factory. They call Register(this) to pass >+themselves with the factory. They call Register(this) to pass > themselves to the factory. > ******************************************************************************/ > void PrinterFactory::Register >@@ -129,7 +129,7 @@ void PrinterFactory::Register > //UnRegister > //! UnRegister proxy classes for printer families > /*! >-PrinterProxy subclasses use this to unregister themselves with their destuctor >+PrinterProxy subclasses use this to unthemselves with their destuctor > executes. > ******************************************************************************/ > void PrinterFactory::UnRegister >diff --git a/prnt/hpijs/systemservices.h b/prnt/hpijs/systemservices.h >index 421a2fc..c5e74e6 100644 >--- a/prnt/hpijs/systemservices.h >+++ b/prnt/hpijs/systemservices.h >@@ -187,11 +187,11 @@ public: > virtual BOOL PrinterIsAlive(); > > /*! >- This method reads status register from printer. If the parallel status byte >+ This method reads status from printer. If the parallel status byte > is returned, the function returns TRUE when it sets this value. Otherwise > the function returns FALSE if this functionality is not supported. > >- \param bStatReg Pointer to a byte into which status register will be copied. >+ \param bStatReg Pointer to a byte into which status will be copied. > > \return TRUE The value is set after returning the parallel status byte, > FALSE if the functionality is not supported. >diff --git a/prnt/hpps/psutil.c b/prnt/hpps/psutil.c >index 7282dc2..87fba4f 100644 >--- a/prnt/hpps/psutil.c >+++ b/prnt/hpps/psutil.c >@@ -148,9 +148,9 @@ static int fcopy(long upto) > /* build array of pointers to start/end of pages */ > void scanpages(void) > { >- register char *comment = buffer+2; >- register int nesting = 0; >- register long int record; >+ char *comment = buffer+2; >+ int nesting = 0; >+ long int record; > > if ((pageptr = (long *)malloc(sizeof(long)*maxpages)) == NULL) > message(FATAL, "out of memory\n"); >diff --git a/protocol/discovery/avahiDiscovery.c b/protocol/discovery/avahiDiscovery.c >index 43adaa4..c33630c 100644 >--- a/protocol/discovery/avahiDiscovery.c >+++ b/protocol/discovery/avahiDiscovery.c >@@ -435,7 +435,7 @@ static void host_name_resolver_callback( > avahi_host_name_resolver_free(r); > } > /* >-This function will register the callbacks for the avahi calls. >+This function will the callbacks for the avahi calls. > Parameters: > iCommandType - INPUT - Lookup / Probe scanner. > iHostName - INPUT - Host name of the scanner. >-- >2.41.0 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=864950">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 909351
:
864795
| 864950
