summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2020-01-30 20:17:43 +0900
committerMichele Calgaro <[email protected]>2020-01-30 23:52:49 +0900
commitf13ffb0586985f99a4fba6d0ef2a9fa35cb97d11 (patch)
treee36e0beb76de307dbc83567c7753fc43e2a6bbf0
parent0ea623f00178e9b9c9cf013d9cdaf4e8a56dadf3 (diff)
downloadlibksquirrel-f13ffb0586985f99a4fba6d0ef2a9fa35cb97d11.tar.gz
libksquirrel-f13ffb0586985f99a4fba6d0ef2a9fa35cb97d11.zip
Removed explicit usage of the 'register' keyword.
Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 3e022a26a0719e86ca99bb9401bab1bbe1a19e1c)
-rw-r--r--kernel/kls_jbig/libjbig/jbig.c14
-rw-r--r--kernel/kls_ljpeg/ljpeg2ppm/huffd.c14
-rw-r--r--kernel/kls_ljpeg/ljpeg2ppm/predictor.c4
-rw-r--r--kernel/kls_ljpeg/ljpeg2ppm/predictor.h4
4 files changed, 18 insertions, 18 deletions
diff --git a/kernel/kls_jbig/libjbig/jbig.c b/kernel/kls_jbig/libjbig/jbig.c
index 6d8afa3..9fcee55 100644
--- a/kernel/kls_jbig/libjbig/jbig.c
+++ b/kernel/kls_jbig/libjbig/jbig.c
@@ -324,8 +324,8 @@ ARITH_INL void arith_encode(struct jbg_arenc_state *s, int cx, int pix)
{
extern short jbg_lsz[];
extern unsigned char jbg_nmps[], jbg_nlps[];
- register unsigned lsz, ss;
- register unsigned char *st;
+ unsigned lsz, ss;
+ unsigned char *st;
long temp;
#ifdef DEBUG
@@ -437,8 +437,8 @@ ARITH_INL int arith_decode(struct jbg_ardec_state *s, int cx)
{
extern short jbg_lsz[];
extern unsigned char jbg_nmps[], jbg_nlps[];
- register unsigned lsz, ss;
- register unsigned char *st;
+ unsigned lsz, ss;
+ unsigned char *st;
int pix;
/* renormalization */
@@ -2031,8 +2031,8 @@ static size_t decode_pscd(struct jbg_dec_state *s, unsigned char *data,
unsigned int layer, plane;
unsigned long hl, ll, y, hx, hy, lx, ly, hbpl, lbpl;
unsigned char *hp, *lp1, *lp2, *p1, *q1;
- register unsigned long line_h1, line_h2, line_h3;
- register unsigned long line_l1, line_l2, line_l3;
+ unsigned long line_h1, line_h2, line_h3;
+ unsigned long line_l1, line_l2, line_l3;
struct jbg_ardec_state *se;
unsigned long x;
long o;
@@ -2978,7 +2978,7 @@ void jbg_split_planes(unsigned long x, unsigned long y, int has_planes,
unsigned k = 8;
int p;
unsigned prev; /* previous *src byte shifted by 8 bit to the left */
- register int bits, msb = has_planes - 1;
+ int bits, msb = has_planes - 1;
int bitno;
/* sanity checks */
diff --git a/kernel/kls_ljpeg/ljpeg2ppm/huffd.c b/kernel/kls_ljpeg/ljpeg2ppm/huffd.c
index 456acf3..ea3480c 100644
--- a/kernel/kls_ljpeg/ljpeg2ppm/huffd.c
+++ b/kernel/kls_ljpeg/ljpeg2ppm/huffd.c
@@ -201,7 +201,7 @@ PmPutRow(RowBuf,numComp,numCol,Pt)
MCU *RowBuf;
int numCol,Pt;
{
- register int col,v;
+ int col,v;
/*
* Mulitply 2^Pt before output. Pt is the point
@@ -240,7 +240,7 @@ PmPutRow(RowBuf,numComp,numCol,Pt)
*--------------------------------------------------------------
*/
#define PmPutRow(RowBuf,numComp,numCol,Pt) \
-{ register int col,v; \
+{ int col,v; \
if (numComp==1) { /*pgm*/ \
for (col = 0; col < numCol; col++) { \
v=RowBuf[col][0]<<Pt; \
@@ -479,9 +479,9 @@ void DecodeFirstRow(dcPtr,curRowBuf)
DecompressInfo *dcPtr;
MCU *curRowBuf;
{
- register short curComp,ci;
- register int s,col,compsInScan,numCOL;
- register JpegComponentInfo *compptr;
+ short curComp,ci;
+ int s,col,compsInScan,numCOL;
+ JpegComponentInfo *compptr;
int Pr,Pt,d;
HuffmanTable *dctbl;
@@ -568,8 +568,8 @@ void
DecodeImage(dcPtr)
DecompressInfo *dcPtr;
{
- register int s,d,col,row;
- register short curComp, ci;
+ int s,d,col,row;
+ short curComp, ci;
HuffmanTable *dctbl;
JpegComponentInfo *compptr;
int predictor;
diff --git a/kernel/kls_ljpeg/ljpeg2ppm/predictor.c b/kernel/kls_ljpeg/ljpeg2ppm/predictor.c
index 36dedfd..c69c8b9 100644
--- a/kernel/kls_ljpeg/ljpeg2ppm/predictor.c
+++ b/kernel/kls_ljpeg/ljpeg2ppm/predictor.c
@@ -57,7 +57,7 @@ Predict(row,col,curComp,curRowBuf,prevRowBuf,Pr,Pt,psv,predictor)
int psv; /* predictor selection value */
int *predictor; /* preditor value (output) */
{
- register int left,upper,diag,leftcol;
+ int left,upper,diag,leftcol;
leftcol=col-1;
if (row==0) {
@@ -146,7 +146,7 @@ QuickPredict(col,curComp,curRowBuf,prevRowBuf,psv,predictor)
int psv; /* predictor selection value */
int *predictor; /* preditor value (output) */
{
- register int left,upper,diag,leftcol;
+ int left,upper,diag,leftcol;
leftcol=col-1;
upper=prevRowBuf[col][curComp];
diff --git a/kernel/kls_ljpeg/ljpeg2ppm/predictor.h b/kernel/kls_ljpeg/ljpeg2ppm/predictor.h
index a27b34e..6a1e5b6 100644
--- a/kernel/kls_ljpeg/ljpeg2ppm/predictor.h
+++ b/kernel/kls_ljpeg/ljpeg2ppm/predictor.h
@@ -49,7 +49,7 @@
*--------------------------------------------------------------
*/
#define Predict(row,col,curComp,curRowBuf,prevRowBuf,Pr,Pt,psv,predictor)\
-{ register int left,upper,diag,leftcol; \
+{ int left,upper,diag,leftcol; \
\
leftcol=col-1; \
if (row==0) { \
@@ -131,7 +131,7 @@
*--------------------------------------------------------------
*/
#define QuickPredict(col,curComp,curRowBuf,prevRowBuf,psv,predictor){ \
- register int left,upper,diag,leftcol; \
+ int left,upper,diag,leftcol; \
\
leftcol=col-1; \
upper=prevRowBuf[col][curComp]; \