Remove register instruction #19
Merged
SlavekB
merged 7 commits from feat/remove-register-instruction into master 3 months ago
@ -0,0 +1,297 @@
|
||||
diff --git a/lib/alloca.c b/lib/alloca.c
|
||||
index c1699c4..b533583 100644
|
||||
--- a/lib/alloca.c
|
||||
+++ b/lib/alloca.c
|
||||
@@ -172,7 +172,7 @@ alloca (size)
|
||||
unsigned size;
|
||||
{
|
||||
auto char probe; /* Probes stack depth: */
|
||||
- register char *depth = ADDRESS_FUNCTION (probe);
|
||||
+ char *depth = ADDRESS_FUNCTION (probe);
|
||||
|
||||
#if STACK_DIRECTION == 0
|
||||
if (STACK_DIR == 0) /* Unknown growth direction. */
|
||||
@@ -183,7 +183,7 @@ alloca (size)
|
||||
was allocated from deeper in the stack than currently. */
|
||||
|
||||
{
|
||||
- register header *hp; /* Traverses linked list. */
|
||||
+ header *hp; /* Traverses linked list. */
|
||||
|
||||
#ifdef emacs
|
||||
BLOCK_INPUT;
|
||||
@@ -193,7 +193,7 @@ alloca (size)
|
||||
if ((STACK_DIR > 0 && hp->h.deep > depth)
|
||||
|| (STACK_DIR < 0 && hp->h.deep < depth))
|
||||
{
|
||||
- register header *np = hp->h.next;
|
||||
+ header *np = hp->h.next;
|
||||
|
||||
free ((pointer) hp); /* Collect garbage. */
|
||||
|
||||
@@ -215,7 +215,7 @@ alloca (size)
|
||||
/* Allocate combined header + user data storage. */
|
||||
|
||||
{
|
||||
- register pointer new = malloc (sizeof (header) + size);
|
||||
+ pointer new = malloc (sizeof (header) + size);
|
||||
/* Address of header. */
|
||||
|
||||
if (new == 0)
|
||||
diff --git a/lib/getline.c b/lib/getline.c
|
||||
index ba05abb..8995eb5 100644
|
||||
--- a/lib/getline.c
|
||||
+++ b/lib/getline.c
|
||||
@@ -88,7 +88,7 @@ getstr (lineptr, n, stream, terminator, offset)
|
||||
|
||||
for (;;)
|
||||
{
|
||||
- register int c = getc (stream);
|
||||
+ int c = getc (stream);
|
||||
|
||||
/* We always want at least one char left in the buffer, since we
|
||||
always (unless we get an error while reading the first char)
|
||||
diff --git a/lib/getopt.c b/lib/getopt.c
|
||||
index 7da985f..60041d0 100644
|
||||
--- a/lib/getopt.c
|
||||
+++ b/lib/getopt.c
|
||||
@@ -346,7 +346,7 @@ exchange (argv)
|
||||
{
|
||||
/* Bottom segment is the short one. */
|
||||
int len = middle - bottom;
|
||||
- register int i;
|
||||
+ int i;
|
||||
|
||||
/* Swap it with the top part of the top segment. */
|
||||
for (i = 0; i < len; i++)
|
||||
@@ -363,7 +363,7 @@ exchange (argv)
|
||||
{
|
||||
/* Top segment is the short one. */
|
||||
int len = top - middle;
|
||||
- register int i;
|
||||
+ int i;
|
||||
|
||||
/* Swap it with the bottom part of the bottom segment. */
|
||||
for (i = 0; i < len; i++)
|
||||
diff --git a/lib/memset.c b/lib/memset.c
|
||||
index a0db560..c2b2950 100644
|
||||
--- a/lib/memset.c
|
||||
+++ b/lib/memset.c
|
||||
@@ -21,7 +21,7 @@ memset (str, c, len)
|
||||
int c;
|
||||
unsigned len;
|
||||
{
|
||||
- register char *st = str;
|
||||
+ char *st = str;
|
||||
|
||||
while (len-- > 0)
|
||||
*st++ = c;
|
||||
diff --git a/lib/obstack.c b/lib/obstack.c
|
||||
index e5b5d4f..a8c26fa 100644
|
||||
--- a/lib/obstack.c
|
||||
+++ b/lib/obstack.c
|
||||
@@ -160,7 +160,7 @@ _obstack_begin (h, size, alignment, chunkfun, freefun)
|
||||
void (*freefun) ();
|
||||
#endif
|
||||
{
|
||||
- register struct _obstack_chunk *chunk; /* points to new chunk */
|
||||
+ struct _obstack_chunk *chunk; /* points to new chunk */
|
||||
|
||||
if (alignment == 0)
|
||||
alignment = (int) DEFAULT_ALIGNMENT;
|
||||
@@ -219,7 +219,7 @@ _obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg)
|
||||
#endif
|
||||
POINTER arg;
|
||||
{
|
||||
- register struct _obstack_chunk *chunk; /* points to new chunk */
|
||||
+ struct _obstack_chunk *chunk; /* points to new chunk */
|
||||
|
||||
if (alignment == 0)
|
||||
alignment = (int) DEFAULT_ALIGNMENT;
|
||||
@@ -276,11 +276,11 @@ _obstack_newchunk (h, length)
|
||||
struct obstack *h;
|
||||
int length;
|
||||
{
|
||||
- register struct _obstack_chunk *old_chunk = h->chunk;
|
||||
- register struct _obstack_chunk *new_chunk;
|
||||
- register long new_size;
|
||||
- register long obj_size = h->next_free - h->object_base;
|
||||
- register long i;
|
||||
+ struct _obstack_chunk *old_chunk = h->chunk;
|
||||
+ struct _obstack_chunk *new_chunk;
|
||||
+ long new_size;
|
||||
+ long obj_size = h->next_free - h->object_base;
|
||||
+ long i;
|
||||
long already;
|
||||
|
||||
/* Compute size for new chunk. */
|
||||
@@ -346,8 +346,8 @@ _obstack_allocated_p (h, obj)
|
||||
struct obstack *h;
|
||||
POINTER obj;
|
||||
{
|
||||
- register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
|
||||
- register struct _obstack_chunk *plp; /* point to previous chunk if any */
|
||||
+ struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
|
||||
+ struct _obstack_chunk *plp; /* point to previous chunk if any */
|
||||
|
||||
lp = (h)->chunk;
|
||||
/* We use >= rather than > since the object cannot be exactly at
|
||||
@@ -374,8 +374,8 @@ _obstack_free (h, obj)
|
||||
struct obstack *h;
|
||||
POINTER obj;
|
||||
{
|
||||
- register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
|
||||
- register struct _obstack_chunk *plp; /* point to previous chunk if any */
|
||||
+ struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
|
||||
+ struct _obstack_chunk *plp; /* point to previous chunk if any */
|
||||
|
||||
lp = h->chunk;
|
||||
/* We use >= because there cannot be an object at the beginning of a chunk.
|
||||
@@ -408,8 +408,8 @@ obstack_free (h, obj)
|
||||
struct obstack *h;
|
||||
POINTER obj;
|
||||
{
|
||||
- register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
|
||||
- register struct _obstack_chunk *plp; /* point to previous chunk if any */
|
||||
+ struct _obstack_chunk *lp; /* below addr of any objects in this chunk */
|
||||
+ struct _obstack_chunk *plp; /* point to previous chunk if any */
|
||||
|
||||
lp = h->chunk;
|
||||
/* We use >= because there cannot be an object at the beginning of a chunk.
|
||||
@@ -439,8 +439,8 @@ int
|
||||
_obstack_memory_used (h)
|
||||
struct obstack *h;
|
||||
{
|
||||
- register struct _obstack_chunk* lp;
|
||||
- register int nbytes = 0;
|
||||
+ struct _obstack_chunk* lp;
|
||||
+ int nbytes = 0;
|
||||
|
||||
for (lp = h->chunk; lp != 0; lp = lp->prev)
|
||||
{
|
||||
diff --git a/lib/stpcpy.c b/lib/stpcpy.c
|
||||
index 0ad8863..14be0e0 100644
|
||||
--- a/lib/stpcpy.c
|
||||
+++ b/lib/stpcpy.c
|
||||
@@ -37,8 +37,8 @@ __stpcpy (dest, src)
|
||||
char *dest;
|
||||
const char *src;
|
||||
{
|
||||
- register char *d = dest;
|
||||
- register const char *s = src;
|
||||
+ char *d = dest;
|
||||
+ const char *s = src;
|
||||
|
||||
do
|
||||
*d++ = *s;
|
||||
diff --git a/lib/strtol.c b/lib/strtol.c
|
||||
index d49f1c6..8fd350b 100644
|
||||
--- a/lib/strtol.c
|
||||
+++ b/lib/strtol.c
|
||||
@@ -238,11 +238,11 @@ INTERNAL (strtol) (nptr, endptr, base, group LOCALE_PARAM)
|
||||
LOCALE_PARAM_DECL
|
||||
{
|
||||
int negative;
|
||||
- register unsigned LONG int cutoff;
|
||||
- register unsigned int cutlim;
|
||||
- register unsigned LONG int i;
|
||||
- register const STRING_TYPE *s;
|
||||
- register UCHAR_TYPE c;
|
||||
+ unsigned LONG int cutoff;
|
||||
+ unsigned int cutlim;
|
||||
+ unsigned LONG int i;
|
||||
+ const STRING_TYPE *s;
|
||||
+ UCHAR_TYPE c;
|
||||
const STRING_TYPE *save, *end;
|
||||
int overflow;
|
||||
|
||||
diff --git a/src/po-gram.gen.c b/src/po-gram.gen.c
|
||||
index 7ac7fa6..1e65466 100644
|
||||
--- a/src/po-gram.gen.c
|
||||
+++ b/src/po-gram.gen.c
|
||||
@@ -324,9 +324,9 @@ __po_gram__memcpy (to, from, count)
|
||||
char *from;
|
||||
int count;
|
||||
{
|
||||
- register char *f = from;
|
||||
- register char *t = to;
|
||||
- register int i = count;
|
||||
+ char *f = from;
|
||||
+ char *t = to;
|
||||
+ int i = count;
|
||||
|
||||
while (i-- > 0)
|
||||
*t++ = *f++;
|
||||
@@ -339,9 +339,9 @@ __po_gram__memcpy (to, from, count)
|
||||
static void
|
||||
__po_gram__memcpy (char *to, char *from, int count)
|
||||
{
|
||||
- register char *f = from;
|
||||
- register char *t = to;
|
||||
- register int i = count;
|
||||
+ char *f = from;
|
||||
+ char *t = to;
|
||||
+ int i = count;
|
||||
|
||||
while (i-- > 0)
|
||||
*t++ = *f++;
|
||||
@@ -375,10 +375,10 @@ int
|
||||
po_gram_parse(po_gram_PARSE_PARAM_ARG)
|
||||
po_gram_PARSE_PARAM_DECL
|
||||
{
|
||||
- register int po_gram_state;
|
||||
- register int po_gram_n;
|
||||
- register short *po_gram_ssp;
|
||||
- register po_gram_STYPE *po_gram_vsp;
|
||||
+ int po_gram_state;
|
||||
+ int po_gram_n;
|
||||
+ short *po_gram_ssp;
|
||||
+ po_gram_STYPE *po_gram_vsp;
|
||||
int po_gram_errstatus; /* number of tokens to shift before error messages enabled */
|
||||
int po_gram_char1 = 0; /* lookahead token as an internal (translated) token number */
|
||||
|
||||
diff --git a/src/po-hash.gen.c b/src/po-hash.gen.c
|
||||
index b7ded1b..bc31589 100644
|
||||
--- a/src/po-hash.gen.c
|
||||
+++ b/src/po-hash.gen.c
|
||||
@@ -341,9 +341,9 @@ __po_hash__memcpy (to, from, count)
|
||||
char *from;
|
||||
int count;
|
||||
{
|
||||
- register char *f = from;
|
||||
- register char *t = to;
|
||||
- register int i = count;
|
||||
+ char *f = from;
|
||||
+ char *t = to;
|
||||
+ int i = count;
|
||||
|
||||
while (i-- > 0)
|
||||
*t++ = *f++;
|
||||
@@ -356,9 +356,9 @@ __po_hash__memcpy (to, from, count)
|
||||
static void
|
||||
__po_hash__memcpy (char *to, char *from, int count)
|
||||
{
|
||||
- register char *f = from;
|
||||
- register char *t = to;
|
||||
- register int i = count;
|
||||
+ char *f = from;
|
||||
+ char *t = to;
|
||||
+ int i = count;
|
||||
|
||||
while (i-- > 0)
|
||||
*t++ = *f++;
|
||||
@@ -392,10 +392,10 @@ int
|
||||
po_hash_parse(po_hash_PARSE_PARAM_ARG)
|
||||
po_hash_PARSE_PARAM_DECL
|
||||
{
|
||||
- register int po_hash_state;
|
||||
- register int po_hash_n;
|
||||
- register short *po_hash_ssp;
|
||||
- register po_hash_STYPE *po_hash_vsp;
|
||||
+ int po_hash_state;
|
||||
+ int po_hash_n;
|
||||
+ short *po_hash_ssp;
|
||||
+ po_hash_STYPE *po_hash_vsp;
|
||||
int po_hash_errstatus; /* number of tokens to shift before error messages enabled */
|
||||
int po_hash_char1 = 0; /* lookahead token as an internal (translated) token number */
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
gettext-0.10.35.diff
|
||||
automake-1.14.diff
|
||||
remove-register-instruction.diff
|
||||
|
||||
@ -0,0 +1,11 @@
|
||||
--- a/Imlib/utils.c
|
||||
+++ b/Imlib/utils.c
|
||||
@@ -455,7 +455,7 @@ void
|
||||
Imlib_bevel_image(ImlibData *id, ImlibImage *im, ImlibBorder *bord,
|
||||
unsigned char up)
|
||||
{
|
||||
- register unsigned char *ptr;
|
||||
+ unsigned char *ptr;
|
||||
double v;
|
||||
int x, y, xbound, ybound;
|
||||
|
||||
@ -0,0 +1,71 @@
|
||||
Index: b/src/libjasper/base/jas_getopt.c
|
||||
===================================================================
|
||||
--- a/src/libjasper/base/jas_getopt.c
|
||||
+++ b/src/libjasper/base/jas_getopt.c
|
||||
@@ -74,6 +74,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
+#include "jasper/jas_debug.h"
|
||||
#include "jasper/jas_getopt.h"
|
||||
#include "jasper/jas_math.h"
|
||||
|
||||
Index: b/src/libjasper/jpc/jpc_t1dec.c
|
||||
===================================================================
|
||||
--- a/src/libjasper/jpc/jpc_t1dec.c
|
||||
+++ b/src/libjasper/jpc/jpc_t1dec.c
|
||||
@@ -75,6 +75,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
+#include "jasper/jas_debug.h"
|
||||
#include "jasper/jas_fix.h"
|
||||
#include "jasper/jas_stream.h"
|
||||
#include "jasper/jas_math.h"
|
||||
Index: b/src/libjasper/jpc/jpc_tsfb.c
|
||||
===================================================================
|
||||
--- a/src/libjasper/jpc/jpc_tsfb.c
|
||||
+++ b/src/libjasper/jpc/jpc_tsfb.c
|
||||
@@ -82,10 +82,18 @@
|
||||
#include "jpc_util.h"
|
||||
#include "jpc_math.h"
|
||||
|
||||
+/* function prototypes */
|
||||
+
|
||||
void jpc_tsfb_getbands2(jpc_tsfb_t *tsfb, int locxstart, int locystart,
|
||||
int xstart, int ystart, int xend, int yend, jpc_tsfb_band_t **bands,
|
||||
int numlvls);
|
||||
|
||||
+int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
|
||||
+ int width, int height, int stride, int numlvls);
|
||||
+
|
||||
+int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
|
||||
+ int width, int height, int stride, int numlvls);
|
||||
+
|
||||
/******************************************************************************\
|
||||
*
|
||||
\******************************************************************************/
|
||||
Index: b/src/libjasper/mif/mif_cod.c
|
||||
===================================================================
|
||||
--- a/src/libjasper/mif/mif_cod.c
|
||||
+++ b/src/libjasper/mif/mif_cod.c
|
||||
@@ -65,6 +65,7 @@
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
+#include "jasper/jas_debug.h"
|
||||
#include "jasper/jas_tvp.h"
|
||||
#include "jasper/jas_stream.h"
|
||||
#include "jasper/jas_image.h"
|
||||
Index: b/src/libjasper/pnm/pnm_dec.c
|
||||
===================================================================
|
||||
--- a/src/libjasper/pnm/pnm_dec.c
|
||||
+++ b/src/libjasper/pnm/pnm_dec.c
|
||||
@@ -76,6 +76,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <assert.h>
|
||||
|
||||
+#include "jasper/jas_debug.h"
|
||||
#include "jasper/jas_types.h"
|
||||
#include "jasper/jas_stream.h"
|
||||
#include "jasper/jas_image.h"
|
||||
@ -0,0 +1,518 @@
|
||||
Index: b/src/libjasper/jpc/jpc_mqdec.c
|
||||
===================================================================
|
||||
--- a/src/libjasper/jpc/jpc_mqdec.c
|
||||
+++ b/src/libjasper/jpc/jpc_mqdec.c
|
||||
@@ -220,7 +220,7 @@
|
||||
|
||||
/* Decode a bit. */
|
||||
|
||||
-int jpc_mqdec_getbit_func(register jpc_mqdec_t *mqdec)
|
||||
+int jpc_mqdec_getbit_func(jpc_mqdec_t *mqdec)
|
||||
{
|
||||
int bit;
|
||||
JAS_DBGLOG(100, ("jpc_mqdec_getbit_func(%p)\n", mqdec));
|
||||
@@ -233,10 +233,10 @@
|
||||
}
|
||||
|
||||
/* Apply MPS_EXCHANGE algorithm (with RENORMD). */
|
||||
-int jpc_mqdec_mpsexchrenormd(register jpc_mqdec_t *mqdec)
|
||||
+int jpc_mqdec_mpsexchrenormd(jpc_mqdec_t *mqdec)
|
||||
{
|
||||
int ret;
|
||||
- register jpc_mqstate_t *state = *mqdec->curctx;
|
||||
+ jpc_mqstate_t *state = *mqdec->curctx;
|
||||
jpc_mqdec_mpsexchange(mqdec->areg, state->qeval, mqdec->curctx, ret);
|
||||
jpc_mqdec_renormd(mqdec->areg, mqdec->creg, mqdec->ctreg, mqdec->in,
|
||||
mqdec->eof, mqdec->inbuffer);
|
||||
@@ -244,10 +244,10 @@
|
||||
}
|
||||
|
||||
/* Apply LPS_EXCHANGE algorithm (with RENORMD). */
|
||||
-int jpc_mqdec_lpsexchrenormd(register jpc_mqdec_t *mqdec)
|
||||
+int jpc_mqdec_lpsexchrenormd(jpc_mqdec_t *mqdec)
|
||||
{
|
||||
int ret;
|
||||
- register jpc_mqstate_t *state = *mqdec->curctx;
|
||||
+ jpc_mqstate_t *state = *mqdec->curctx;
|
||||
jpc_mqdec_lpsexchange(mqdec->areg, state->qeval, mqdec->curctx, ret);
|
||||
jpc_mqdec_renormd(mqdec->areg, mqdec->creg, mqdec->ctreg, mqdec->in,
|
||||
mqdec->eof, mqdec->inbuffer);
|
||||
Index: b/src/libjasper/jpc/jpc_mqdec.h
|
||||
===================================================================
|
||||
--- a/src/libjasper/jpc/jpc_mqdec.h
|
||||
+++ b/src/libjasper/jpc/jpc_mqdec.h
|
||||
@@ -196,12 +196,12 @@
|
||||
#define jpc_mqdec_mpsexchange(areg, delta, curctx, bit) \
|
||||
{ \
|
||||
if ((areg) < (delta)) { \
|
||||
- register jpc_mqstate_t *state = *(curctx); \
|
||||
+ jpc_mqstate_t *state = *(curctx); \
|
||||
/* LPS decoded. */ \
|
||||
(bit) = state->mps ^ 1; \
|
||||
*(curctx) = state->nlps; \
|
||||
} else { \
|
||||
- register jpc_mqstate_t *state = *(curctx); \
|
||||
+ jpc_mqstate_t *state = *(curctx); \
|
||||
/* MPS decoded. */ \
|
||||
(bit) = state->mps; \
|
||||
*(curctx) = state->nmps; \
|
||||
@@ -211,12 +211,12 @@
|
||||
#define jpc_mqdec_lpsexchange(areg, delta, curctx, bit) \
|
||||
{ \
|
||||
if ((areg) >= (delta)) { \
|
||||
- register jpc_mqstate_t *state = *(curctx); \
|
||||
+ jpc_mqstate_t *state = *(curctx); \
|
||||
(areg) = (delta); \
|
||||
(bit) = state->mps ^ 1; \
|
||||
*(curctx) = state->nlps; \
|
||||
} else { \
|
||||
- register jpc_mqstate_t *state = *(curctx); \
|
||||
+ jpc_mqstate_t *state = *(curctx); \
|
||||
(areg) = (delta); \
|
||||
(bit) = state->mps; \
|
||||
*(curctx) = state->nmps; \
|
||||
Index: b/src/libjasper/jpc/jpc_qmfb.c
|
||||
===================================================================
|
||||
--- a/src/libjasper/jpc/jpc_qmfb.c
|
||||
+++ b/src/libjasper/jpc/jpc_qmfb.c
|
||||
@@ -308,10 +308,10 @@
|
||||
size_t bufsize = JPC_CEILDIVPOW2(numcols, 1);
|
||||
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
|
||||
jpc_fix_t *buf = splitbuf;
|
||||
- register jpc_fix_t *srcptr;
|
||||
- register jpc_fix_t *dstptr;
|
||||
- register int n;
|
||||
- register int m;
|
||||
+ jpc_fix_t *srcptr;
|
||||
+ jpc_fix_t *dstptr;
|
||||
+ int n;
|
||||
+ int m;
|
||||
int hstartcol;
|
||||
|
||||
/* Get a buffer. */
|
||||
@@ -368,10 +368,10 @@
|
||||
size_t bufsize = JPC_CEILDIVPOW2(numrows, 1);
|
||||
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
|
||||
jpc_fix_t *buf = splitbuf;
|
||||
- register jpc_fix_t *srcptr;
|
||||
- register jpc_fix_t *dstptr;
|
||||
- register int n;
|
||||
- register int m;
|
||||
+ jpc_fix_t *srcptr;
|
||||
+ jpc_fix_t *dstptr;
|
||||
+ int n;
|
||||
+ int m;
|
||||
int hstartrow;
|
||||
|
||||
/* Get a buffer. */
|
||||
@@ -431,10 +431,10 @@
|
||||
jpc_fix_t *buf = splitbuf;
|
||||
jpc_fix_t *srcptr;
|
||||
jpc_fix_t *dstptr;
|
||||
- register jpc_fix_t *srcptr2;
|
||||
- register jpc_fix_t *dstptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *srcptr2;
|
||||
+ jpc_fix_t *dstptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int m;
|
||||
int hstartrow;
|
||||
|
||||
@@ -513,10 +513,10 @@
|
||||
jpc_fix_t *buf = splitbuf;
|
||||
jpc_fix_t *srcptr;
|
||||
jpc_fix_t *dstptr;
|
||||
- register jpc_fix_t *srcptr2;
|
||||
- register jpc_fix_t *dstptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *srcptr2;
|
||||
+ jpc_fix_t *dstptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int m;
|
||||
int hstartcol;
|
||||
|
||||
@@ -591,9 +591,9 @@
|
||||
int bufsize = JPC_CEILDIVPOW2(numcols, 1);
|
||||
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
|
||||
jpc_fix_t *buf = joinbuf;
|
||||
- register jpc_fix_t *srcptr;
|
||||
- register jpc_fix_t *dstptr;
|
||||
- register int n;
|
||||
+ jpc_fix_t *srcptr;
|
||||
+ jpc_fix_t *dstptr;
|
||||
+ int n;
|
||||
int hstartcol;
|
||||
|
||||
/* Allocate memory for the join buffer from the heap. */
|
||||
@@ -648,9 +648,9 @@
|
||||
size_t bufsize = JPC_CEILDIVPOW2(numrows, 1);
|
||||
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
|
||||
jpc_fix_t *buf = joinbuf;
|
||||
- register jpc_fix_t *srcptr;
|
||||
- register jpc_fix_t *dstptr;
|
||||
- register int n;
|
||||
+ jpc_fix_t *srcptr;
|
||||
+ jpc_fix_t *dstptr;
|
||||
+ int n;
|
||||
int hstartcol;
|
||||
|
||||
/* Allocate memory for the join buffer from the heap. */
|
||||
@@ -707,10 +707,10 @@
|
||||
jpc_fix_t *buf = joinbuf;
|
||||
jpc_fix_t *srcptr;
|
||||
jpc_fix_t *dstptr;
|
||||
- register jpc_fix_t *srcptr2;
|
||||
- register jpc_fix_t *dstptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *srcptr2;
|
||||
+ jpc_fix_t *dstptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int hstartcol;
|
||||
|
||||
/* Allocate memory for the join buffer from the heap. */
|
||||
@@ -785,10 +785,10 @@
|
||||
jpc_fix_t *buf = joinbuf;
|
||||
jpc_fix_t *srcptr;
|
||||
jpc_fix_t *dstptr;
|
||||
- register jpc_fix_t *srcptr2;
|
||||
- register jpc_fix_t *dstptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *srcptr2;
|
||||
+ jpc_fix_t *dstptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int hstartcol;
|
||||
|
||||
/* Allocate memory for the join buffer from the heap. */
|
||||
@@ -861,9 +861,9 @@
|
||||
void jpc_ft_fwdlift_row(jpc_fix_t *a, int numcols, int parity)
|
||||
{
|
||||
|
||||
- register jpc_fix_t *lptr;
|
||||
- register jpc_fix_t *hptr;
|
||||
- register int n;
|
||||
+ jpc_fix_t *lptr;
|
||||
+ jpc_fix_t *hptr;
|
||||
+ int n;
|
||||
int llen;
|
||||
|
||||
llen = (numcols + 1 - parity) >> 1;
|
||||
@@ -921,11 +921,11 @@
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
#if 0
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int i;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int i;
|
||||
#endif
|
||||
- register int n;
|
||||
+ int n;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -982,10 +982,10 @@
|
||||
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -1082,10 +1082,10 @@
|
||||
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -1179,9 +1179,9 @@
|
||||
void jpc_ft_invlift_row(jpc_fix_t *a, int numcols, int parity)
|
||||
{
|
||||
|
||||
- register jpc_fix_t *lptr;
|
||||
- register jpc_fix_t *hptr;
|
||||
- register int n;
|
||||
+ jpc_fix_t *lptr;
|
||||
+ jpc_fix_t *hptr;
|
||||
+ int n;
|
||||
int llen;
|
||||
|
||||
llen = (numcols + 1 - parity) >> 1;
|
||||
@@ -1239,11 +1239,11 @@
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
#if 0
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int i;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int i;
|
||||
#endif
|
||||
- register int n;
|
||||
+ int n;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -1300,10 +1300,10 @@
|
||||
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -1400,10 +1400,10 @@
|
||||
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -1581,9 +1581,9 @@
|
||||
void jpc_ns_fwdlift_row(jpc_fix_t *a, int numcols, int parity)
|
||||
{
|
||||
|
||||
- register jpc_fix_t *lptr;
|
||||
- register jpc_fix_t *hptr;
|
||||
- register int n;
|
||||
+ jpc_fix_t *lptr;
|
||||
+ jpc_fix_t *hptr;
|
||||
+ int n;
|
||||
int llen;
|
||||
|
||||
llen = (numcols + 1 - parity) >> 1;
|
||||
@@ -1705,10 +1705,10 @@
|
||||
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -1913,10 +1913,10 @@
|
||||
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -2121,9 +2121,9 @@
|
||||
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int n;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int n;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -2295,9 +2295,9 @@
|
||||
void jpc_ns_invlift_row(jpc_fix_t *a, int numcols, int parity)
|
||||
{
|
||||
|
||||
- register jpc_fix_t *lptr;
|
||||
- register jpc_fix_t *hptr;
|
||||
- register int n;
|
||||
+ jpc_fix_t *lptr;
|
||||
+ jpc_fix_t *hptr;
|
||||
+ int n;
|
||||
int llen;
|
||||
|
||||
llen = (numcols + 1 - parity) >> 1;
|
||||
@@ -2419,10 +2419,10 @@
|
||||
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -2627,10 +2627,10 @@
|
||||
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int n;
|
||||
- register int i;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int n;
|
||||
+ int i;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
@@ -2835,9 +2835,9 @@
|
||||
|
||||
jpc_fix_t *lptr;
|
||||
jpc_fix_t *hptr;
|
||||
- register jpc_fix_t *lptr2;
|
||||
- register jpc_fix_t *hptr2;
|
||||
- register int n;
|
||||
+ jpc_fix_t *lptr2;
|
||||
+ jpc_fix_t *hptr2;
|
||||
+ int n;
|
||||
int llen;
|
||||
|
||||
llen = (numrows + 1 - parity) >> 1;
|
||||
Index: b/src/libjasper/jpc/jpc_t1cod.h
|
||||
===================================================================
|
||||
--- a/src/libjasper/jpc/jpc_t1cod.h
|
||||
+++ b/src/libjasper/jpc/jpc_t1cod.h
|
||||
@@ -239,8 +239,8 @@
|
||||
/* Update the per-sample state information. */
|
||||
#define JPC_UPDATEFLAGS4(fp, rowstep, s, vcausalflag) \
|
||||
{ \
|
||||
- register jpc_fix_t *np = (fp) - (rowstep); \
|
||||
- register jpc_fix_t *sp = (fp) + (rowstep); \
|
||||
+ jpc_fix_t *np = (fp) - (rowstep); \
|
||||
+ jpc_fix_t *sp = (fp) + (rowstep); \
|
||||
if ((vcausalflag)) { \
|
||||
sp[-1] |= JPC_NESIG; \
|
||||
sp[1] |= JPC_NWSIG; \
|
||||
Index: b/src/libjasper/jpc/jpc_t1dec.c
|
||||
===================================================================
|
||||
--- a/src/libjasper/jpc/jpc_t1dec.c
|
||||
+++ b/src/libjasper/jpc/jpc_t1dec.c
|
||||
@@ -359,7 +359,7 @@
|
||||
} \
|
||||
}
|
||||
|
||||
-static int dec_sigpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos, int orient,
|
||||
+static int dec_sigpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos, int orient,
|
||||
int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data)
|
||||
{
|
||||
int i;
|
||||
@@ -567,7 +567,7 @@
|
||||
} \
|
||||
}
|
||||
|
||||
-static int dec_refpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos,
|
||||
+static int dec_refpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos,
|
||||
int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data)
|
||||
{
|
||||
int i;
|
||||
@@ -773,7 +773,7 @@
|
||||
*(fp) &= ~JPC_VISIT; \
|
||||
}
|
||||
|
||||
-static int dec_clnpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos, int orient,
|
||||
+static int dec_clnpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos, int orient,
|
||||
int vcausalflag, int segsymflag, jas_matrix_t *flags, jas_matrix_t *data)
|
||||
{
|
||||
int i;
|
||||
Index: b/src/libjasper/jpc/jpc_t2cod.c
|
||||
===================================================================
|
||||
--- a/src/libjasper/jpc/jpc_t2cod.c
|
||||
+++ b/src/libjasper/jpc/jpc_t2cod.c
|
||||
@@ -137,7 +137,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
-static int jpc_pi_nextlrcp(register jpc_pi_t *pi)
|
||||
+static int jpc_pi_nextlrcp(jpc_pi_t *pi)
|
||||
{
|
||||
jpc_pchg_t *pchg;
|
||||
int *prclyrno;
|
||||
@@ -180,7 +180,7 @@
|
||||
return 1;
|
||||
}
|
||||
|
||||
-static int jpc_pi_nextrlcp(register jpc_pi_t *pi)
|
||||
+static int jpc_pi_nextrlcp(jpc_pi_t *pi)
|
||||
{
|
||||
jpc_pchg_t *pchg;
|
||||
int *prclyrno;
|
||||
@@ -221,7 +221,7 @@
|
||||
return 1;
|
||||
}
|
||||
|
||||
-static int jpc_pi_nextrpcl(register jpc_pi_t *pi)
|
||||
+static int jpc_pi_nextrpcl(jpc_pi_t *pi)
|
||||
{
|
||||
int rlvlno;
|
||||
jpc_pirlvl_t *pirlvl;
|
||||
@@ -313,7 +313,7 @@
|
||||
return 1;
|
||||
}
|
||||
|
||||
-static int jpc_pi_nextpcrl(register jpc_pi_t *pi)
|
||||
+static int jpc_pi_nextpcrl(jpc_pi_t *pi)
|
||||
{
|
||||
int rlvlno;
|
||||
jpc_pirlvl_t *pirlvl;
|
||||
@@ -407,7 +407,7 @@
|
||||
return 1;
|
||||
}
|
||||
|
||||
-static int jpc_pi_nextcprl(register jpc_pi_t *pi)
|
||||
+static int jpc_pi_nextcprl(jpc_pi_t *pi)
|
||||
{
|
||||
int rlvlno;
|
||||
jpc_pirlvl_t *pirlvl;
|
||||
@ -0,0 +1,13 @@
|
||||
Index: b/src/cmsio1.c
|
||||
===================================================================
|
||||
--- a/src/cmsio1.c
|
||||
+++ b/src/cmsio1.c
|
||||
@@ -38,6 +38,8 @@
|
||||
|
||||
#ifdef __BEOS__
|
||||
# define USE_CUSTOM_SWAB 1
|
||||
+#else
|
||||
+extern void swab(const void *from, void *to, size_t len);
|
||||
#endif
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1 +1,3 @@
|
||||
debian-changes.diff
|
||||
remove-register-instruction.diff
|
||||
add-swab-function-prototype.diff
|
||||
|
||||
@ -0,0 +1,360 @@
|
||||
Index: b/common/slp_attr_l.c
|
||||
===================================================================
|
||||
--- a/common/slp_attr_l.c
|
||||
+++ b/common/slp_attr_l.c
|
||||
@@ -680,9 +680,9 @@
|
||||
|
||||
YY_DECL
|
||||
{
|
||||
- register yy_state_type yy_current_state;
|
||||
- register char *yy_cp, *yy_bp;
|
||||
- register int yy_act;
|
||||
+ yy_state_type yy_current_state;
|
||||
+ char *yy_cp, *yy_bp;
|
||||
+ int yy_act;
|
||||
|
||||
#line 123 "slp_attr_l.l"
|
||||
|
||||
@@ -729,7 +729,7 @@
|
||||
yy_match:
|
||||
do
|
||||
{
|
||||
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
|
||||
+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
|
||||
if ( yy_accept[yy_current_state] )
|
||||
{
|
||||
yy_last_accepting_state = yy_current_state;
|
||||
@@ -1057,9 +1057,9 @@
|
||||
|
||||
static int yy_get_next_buffer()
|
||||
{
|
||||
- register char *dest = yy_current_buffer->yy_ch_buf;
|
||||
- register char *source = yytext_ptr;
|
||||
- register int number_to_move, i;
|
||||
+ char *dest = yy_current_buffer->yy_ch_buf;
|
||||
+ char *source = yytext_ptr;
|
||||
+ int number_to_move, i;
|
||||
int ret_val;
|
||||
|
||||
if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
|
||||
@@ -1189,14 +1189,14 @@
|
||||
|
||||
static yy_state_type yy_get_previous_state()
|
||||
{
|
||||
- register yy_state_type yy_current_state;
|
||||
- register char *yy_cp;
|
||||
+ yy_state_type yy_current_state;
|
||||
+ char *yy_cp;
|
||||
|
||||
yy_current_state = yy_start;
|
||||
|
||||
for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
|
||||
{
|
||||
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
|
||||
+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
|
||||
if ( yy_accept[yy_current_state] )
|
||||
{
|
||||
yy_last_accepting_state = yy_current_state;
|
||||
@@ -1228,10 +1228,10 @@
|
||||
yy_state_type yy_current_state;
|
||||
#endif
|
||||
{
|
||||
- register int yy_is_jam;
|
||||
- register char *yy_cp = yy_c_buf_p;
|
||||
+ int yy_is_jam;
|
||||
+ char *yy_cp = yy_c_buf_p;
|
||||
|
||||
- register YY_CHAR yy_c = 1;
|
||||
+ YY_CHAR yy_c = 1;
|
||||
if ( yy_accept[yy_current_state] )
|
||||
{
|
||||
yy_last_accepting_state = yy_current_state;
|
||||
@@ -1252,14 +1252,14 @@
|
||||
|
||||
#ifndef YY_NO_UNPUT
|
||||
#ifdef YY_USE_PROTOS
|
||||
-static void yyunput( int c, register char *yy_bp )
|
||||
+static void yyunput( int c, char *yy_bp )
|
||||
#else
|
||||
static void yyunput( c, yy_bp )
|
||||
int c;
|
||||
-register char *yy_bp;
|
||||
+char *yy_bp;
|
||||
#endif
|
||||
{
|
||||
- register char *yy_cp = yy_c_buf_p;
|
||||
+ char *yy_cp = yy_c_buf_p;
|
||||
|
||||
/* undo effects of setting up yytext */
|
||||
*yy_cp = yy_hold_char;
|
||||
@@ -1267,10 +1267,10 @@
|
||||
if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
|
||||
{ /* need to shift things up to make room */
|
||||
/* +2 for EOB chars. */
|
||||
- register int number_to_move = yy_n_chars + 2;
|
||||
- register char *dest = &yy_current_buffer->yy_ch_buf[
|
||||
+ int number_to_move = yy_n_chars + 2;
|
||||
+ char *dest = &yy_current_buffer->yy_ch_buf[
|
||||
yy_current_buffer->yy_buf_size + 2];
|
||||
- register char *source =
|
||||
+ char *source =
|
||||
&yy_current_buffer->yy_ch_buf[number_to_move];
|
||||
|
||||
while ( source > yy_current_buffer->yy_ch_buf )
|
||||
@@ -1731,7 +1731,7 @@
|
||||
int n;
|
||||
#endif
|
||||
{
|
||||
- register int i;
|
||||
+ int i;
|
||||
for ( i = 0; i < n; ++i )
|
||||
s1[i] = s2[i];
|
||||
}
|
||||
@@ -1745,7 +1745,7 @@
|
||||
yyconst char *s;
|
||||
#endif
|
||||
{
|
||||
- register int n;
|
||||
+ int n;
|
||||
for ( n = 0; s[n]; ++n )
|
||||
;
|
||||
|
||||
Index: b/common/slp_attr_y.c
|
||||
===================================================================
|
||||
--- a/common/slp_attr_y.c
|
||||
+++ b/common/slp_attr_y.c
|
||||
@@ -248,7 +248,7 @@
|
||||
# define YYCOPY(To, From, Count) \
|
||||
do \
|
||||
{ \
|
||||
- register YYSIZE_T yyi; \
|
||||
+ YYSIZE_T yyi; \
|
||||
for (yyi = 0; yyi < (Count); yyi++) \
|
||||
(To)[yyi] = (From)[yyi]; \
|
||||
} \
|
||||
@@ -661,7 +661,7 @@
|
||||
const char *yystr;
|
||||
# endif
|
||||
{
|
||||
- register const char *yys = yystr;
|
||||
+ const char *yys = yystr;
|
||||
|
||||
while (*yys++ != '\0')
|
||||
continue;
|
||||
@@ -686,8 +686,8 @@
|
||||
const char *yysrc;
|
||||
# endif
|
||||
{
|
||||
- register char *yyd = yydest;
|
||||
- register const char *yys = yysrc;
|
||||
+ char *yyd = yydest;
|
||||
+ const char *yys = yysrc;
|
||||
|
||||
while ((*yyd++ = *yys++) != '\0')
|
||||
continue;
|
||||
@@ -817,8 +817,8 @@
|
||||
#endif
|
||||
{
|
||||
|
||||
- register int yystate;
|
||||
- register int yyn;
|
||||
+ int yystate;
|
||||
+ int yyn;
|
||||
int yyresult;
|
||||
/* Number of tokens to shift before error messages enabled. */
|
||||
int yyerrstatus;
|
||||
@@ -836,12 +836,12 @@
|
||||
/* The state stack. */
|
||||
short yyssa[YYINITDEPTH];
|
||||
short *yyss = yyssa;
|
||||
- register short *yyssp;
|
||||
+ short *yyssp;
|
||||
|
||||
/* The semantic value stack. */
|
||||
YYSTYPE yyvsa[YYINITDEPTH];
|
||||
YYSTYPE *yyvs = yyvsa;
|
||||
- register YYSTYPE *yyvsp;
|
||||
+ YYSTYPE *yyvsp;
|
||||
|
||||
|
||||
|
||||
Index: b/common/slp_filter_l.c
|
||||
===================================================================
|
||||
--- a/common/slp_filter_l.c
|
||||
+++ b/common/slp_filter_l.c
|
||||
@@ -638,9 +638,9 @@
|
||||
|
||||
YY_DECL
|
||||
{
|
||||
- register yy_state_type yy_current_state;
|
||||
- register char *yy_cp, *yy_bp;
|
||||
- register int yy_act;
|
||||
+ yy_state_type yy_current_state;
|
||||
+ char *yy_cp, *yy_bp;
|
||||
+ int yy_act;
|
||||
|
||||
#line 97 "slp_filter_l.l"
|
||||
|
||||
@@ -687,7 +687,7 @@
|
||||
yy_match:
|
||||
do
|
||||
{
|
||||
- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
|
||||
+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
|
||||
if ( yy_accept[yy_current_state] )
|
||||
{
|
||||
yy_last_accepting_state = yy_current_state;
|
||||
@@ -993,9 +993,9 @@
|
||||
|
||||
static int yy_get_next_buffer()
|
||||
{
|
||||
- register char *dest = yy_current_buffer->yy_ch_buf;
|
||||
- register char *source = yytext_ptr;
|
||||
- register int number_to_move, i;
|
||||
+ char *dest = yy_current_buffer->yy_ch_buf;
|
||||
+ char *source = yytext_ptr;
|
||||
+ int number_to_move, i;
|
||||
int ret_val;
|
||||
|
||||
if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
|
||||
@@ -1125,14 +1125,14 @@
|
||||
|
||||
static yy_state_type yy_get_previous_state()
|
||||
{
|
||||
- register yy_state_type yy_current_state;
|
||||
- register char *yy_cp;
|
||||
+ yy_state_type yy_current_state;
|
||||
+ char *yy_cp;
|
||||
|
||||
yy_current_state = yy_start;
|
||||
|
||||
for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
|
||||
{
|
||||
- register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
|
||||
+ YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
|
||||
if ( yy_accept[yy_current_state] )
|
||||
{
|
||||
yy_last_accepting_state = yy_current_state;
|
||||
@@ -1164,10 +1164,10 @@
|
||||
yy_state_type yy_current_state;
|
||||
#endif
|
||||
{
|
||||
- register int yy_is_jam;
|
||||
- register char *yy_cp = yy_c_buf_p;
|
||||
+ int yy_is_jam;
|
||||
+ char *yy_cp = yy_c_buf_p;
|
||||
|
||||
- register YY_CHAR yy_c = 1;
|
||||
+ YY_CHAR yy_c = 1;
|
||||
if ( yy_accept[yy_current_state] )
|
||||
{
|
||||
yy_last_accepting_state = yy_current_state;
|
||||
@@ -1188,14 +1188,14 @@
|
||||
|
||||
#ifndef YY_NO_UNPUT
|
||||
#ifdef YY_USE_PROTOS
|
||||
-static void yyunput( int c, register char *yy_bp )
|
||||
+static void yyunput( int c, char *yy_bp )
|
||||
#else
|
||||
static void yyunput( c, yy_bp )
|
||||
int c;
|
||||
-register char *yy_bp;
|
||||
+char *yy_bp;
|
||||
#endif
|
||||
{
|
||||
- register char *yy_cp = yy_c_buf_p;
|
||||
+ char *yy_cp = yy_c_buf_p;
|
||||
|
||||
/* undo effects of setting up yytext */
|
||||
*yy_cp = yy_hold_char;
|
||||
@@ -1203,10 +1203,10 @@
|
||||
if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
|
||||
{ /* need to shift things up to make room */
|
||||
/* +2 for EOB chars. */
|
||||
- register int number_to_move = yy_n_chars + 2;
|
||||
- register char *dest = &yy_current_buffer->yy_ch_buf[
|
||||
+ int number_to_move = yy_n_chars + 2;
|
||||
+ char *dest = &yy_current_buffer->yy_ch_buf[
|
||||
yy_current_buffer->yy_buf_size + 2];
|
||||
- register char *source =
|
||||
+ char *source =
|
||||
&yy_current_buffer->yy_ch_buf[number_to_move];
|
||||
|
||||
while ( source > yy_current_buffer->yy_ch_buf )
|
||||
@@ -1667,7 +1667,7 @@
|
||||
int n;
|
||||
#endif
|
||||
{
|
||||
- register int i;
|
||||
+ int i;
|
||||
for ( i = 0; i < n; ++i )
|
||||
s1[i] = s2[i];
|
||||
}
|
||||
@@ -1681,7 +1681,7 @@
|
||||
yyconst char *s;
|
||||
#endif
|
||||
{
|
||||
- register int n;
|
||||
+ int n;
|
||||
for ( n = 0; s[n]; ++n )
|
||||
;
|
||||
|
||||
Index: b/common/slp_filter_y.c
|
||||
===================================================================
|
||||
--- a/common/slp_filter_y.c
|
||||
+++ b/common/slp_filter_y.c
|
||||
@@ -262,7 +262,7 @@
|
||||
# define YYCOPY(To, From, Count) \
|
||||
do \
|
||||
{ \
|
||||
- register YYSIZE_T yyi; \
|
||||
+ YYSIZE_T yyi; \
|
||||
for (yyi = 0; yyi < (Count); yyi++) \
|
||||
(To)[yyi] = (From)[yyi]; \
|
||||
} \
|
||||
@@ -681,7 +681,7 @@
|
||||
const char *yystr;
|
||||
# endif
|
||||
{
|
||||
- register const char *yys = yystr;
|
||||
+ const char *yys = yystr;
|
||||
|
||||
while (*yys++ != '\0')
|
||||
continue;
|
||||
@@ -706,8 +706,8 @@
|
||||
const char *yysrc;
|
||||
# endif
|
||||
{
|
||||
- register char *yyd = yydest;
|
||||
- register const char *yys = yysrc;
|
||||
+ char *yyd = yydest;
|
||||
+ const char *yys = yysrc;
|
||||
|
||||
while ((*yyd++ = *yys++) != '\0')
|
||||
continue;
|
||||
@@ -837,8 +837,8 @@
|
||||
#endif
|
||||
{
|
||||
|
||||
- register int yystate;
|
||||
- register int yyn;
|
||||
+ int yystate;
|
||||
+ int yyn;
|
||||
int yyresult;
|
||||
/* Number of tokens to shift before error messages enabled. */
|
||||
int yyerrstatus;
|
||||
@@ -856,12 +856,12 @@
|
||||
/* The state stack. */
|
||||
short yyssa[YYINITDEPTH];
|
||||
short *yyss = yyssa;
|
||||
- register short *yyssp;
|
||||
+ short *yyssp;
|
||||
|
||||
/* The semantic value stack. */
|
||||
YYSTYPE yyvsa[YYINITDEPTH];
|
||||
YYSTYPE *yyvs = yyvsa;
|
||||
- register YYSTYPE *yyvsp;
|
||||
+ YYSTYPE *yyvsp;
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,274 @@
|
||||
Index: b/bindings/Python/src/pisock_wrap.c
|
||||
===================================================================
|
||||
--- a/bindings/Python/src/pisock_wrap.c
|
||||
+++ b/bindings/Python/src/pisock_wrap.c
|
||||
@@ -335,14 +335,14 @@
|
||||
swig_module_info *iter = start;
|
||||
do {
|
||||
if (iter->size) {
|
||||
- register size_t l = 0;
|
||||
- register size_t r = iter->size - 1;
|
||||
+ size_t l = 0;
|
||||
+ size_t r = iter->size - 1;
|
||||
do {
|
||||
/* since l+r >= 0, we can (>> 1) instead (/ 2) */
|
||||
- register size_t i = (l + r) >> 1;
|
||||
+ size_t i = (l + r) >> 1;
|
||||
const char *iname = iter->types[i]->name;
|
||||
if (iname) {
|
||||
- register int compare = strcmp(name, iname);
|
||||
+ int compare = strcmp(name, iname);
|
||||
if (compare == 0) {
|
||||
return iter->types[i];
|
||||
} else if (compare < 0) {
|
||||
@@ -386,7 +386,7 @@
|
||||
of the str field (the human readable name) */
|
||||
swig_module_info *iter = start;
|
||||
do {
|
||||
- register size_t i = 0;
|
||||
+ size_t i = 0;
|
||||
for (; i < iter->size; ++i) {
|
||||
if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
|
||||
return iter->types[i];
|
||||
@@ -406,10 +406,10 @@
|
||||
SWIGRUNTIME char *
|
||||
SWIG_PackData(char *c, void *ptr, size_t sz) {
|
||||
static const char hex[17] = "0123456789abcdef";
|
||||
- register const unsigned char *u = (unsigned char *) ptr;
|
||||
- register const unsigned char *eu = u + sz;
|
||||
+ const unsigned char *u = (unsigned char *) ptr;
|
||||
+ const unsigned char *eu = u + sz;
|
||||
for (; u != eu; ++u) {
|
||||
- register unsigned char uu = *u;
|
||||
+ unsigned char uu = *u;
|
||||
*(c++) = hex[(uu & 0xf0) >> 4];
|
||||
*(c++) = hex[uu & 0xf];
|
||||
}
|
||||
@@ -421,11 +421,11 @@
|
||||
*/
|
||||
SWIGRUNTIME const char *
|
||||
SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
|
||||
- register unsigned char *u = (unsigned char *) ptr;
|
||||
- register const unsigned char *eu = u + sz;
|
||||
+ unsigned char *u = (unsigned char *) ptr;
|
||||
+ const unsigned char *eu = u + sz;
|
||||
for (; u != eu; ++u) {
|
||||
- register char d = *(c++);
|
||||
- register unsigned char uu = 0;
|
||||
+ char d = *(c++);
|
||||
+ unsigned char uu = 0;
|
||||
if ((d >= '0') && (d <= '9'))
|
||||
uu = ((d - '0') << 4);
|
||||
else if ((d >= 'a') && (d <= 'f'))
|
||||
Index: b/libpisock/md5.c
|
||||
===================================================================
|
||||
--- a/libpisock/md5.c
|
||||
+++ b/libpisock/md5.c
|
||||
@@ -149,7 +149,7 @@
|
||||
*/
|
||||
void MD5Transform(UINT32 buf[4], UINT32 const in[16])
|
||||
{
|
||||
- register UINT32 a, b, c, d;
|
||||
+ UINT32 a, b, c, d;
|
||||
|
||||
a = buf[0];
|
||||
b = buf[1];
|
||||
Index: b/libpisock/utils.c
|
||||
===================================================================
|
||||
--- a/libpisock/utils.c
|
||||
+++ b/libpisock/utils.c
|
||||
@@ -122,8 +122,8 @@
|
||||
int putenv(const char *string)
|
||||
{
|
||||
const char *const name_end = strchr(string, '=');
|
||||
- register size_t size;
|
||||
- register char **ep;
|
||||
+ size_t size;
|
||||
+ char **ep;
|
||||
|
||||
if (name_end == NULL) {
|
||||
/* Remove the variable from the environment. */
|
||||
@@ -204,12 +204,12 @@
|
||||
***********************************************************************/
|
||||
int inet_aton(const char *cp, struct in_addr *addr)
|
||||
{
|
||||
- register u_long val;
|
||||
- register int base;
|
||||
- register int n;
|
||||
- register char c;
|
||||
- u_int parts[4];
|
||||
- register u_int *pp = parts;
|
||||
+ u_long val;
|
||||
+ int base;
|
||||
+ int n;
|
||||
+ char c;
|
||||
+ u_int parts[4];
|
||||
+ u_int *pp = parts;
|
||||
|
||||
for (;;) {
|
||||
/* Collect number up to ``.''. Values are specified as for
|
||||
Index: b/src/parsedate.c
|
||||
===================================================================
|
||||
--- a/src/parsedate.c
|
||||
+++ b/src/parsedate.c
|
||||
@@ -282,7 +282,7 @@
|
||||
# define YYCOPY(To, From, Count) \
|
||||
do \
|
||||
{ \
|
||||
- register YYSIZE_T yyi; \
|
||||
+ YYSIZE_T yyi; \
|
||||
for (yyi = 0; yyi < (Count); yyi++) \
|
||||
(To)[yyi] = (From)[yyi]; \
|
||||
} \
|
||||
@@ -723,7 +723,7 @@
|
||||
const char *yystr;
|
||||
# endif
|
||||
{
|
||||
- register const char *yys = yystr;
|
||||
+ const char *yys = yystr;
|
||||
|
||||
while (*yys++ != '\0')
|
||||
continue;
|
||||
@@ -748,8 +748,8 @@
|
||||
const char *yysrc;
|
||||
# endif
|
||||
{
|
||||
- register char *yyd = yydest;
|
||||
- register const char *yys = yysrc;
|
||||
+ char *yyd = yydest;
|
||||
+ const char *yys = yysrc;
|
||||
|
||||
while ((*yyd++ = *yys++) != '\0')
|
||||
continue;
|
||||
@@ -879,8 +879,8 @@
|
||||
#endif
|
||||
{
|
||||
|
||||
- register int yystate;
|
||||
- register int yyn;
|
||||
+ int yystate;
|
||||
+ int yyn;
|
||||
int yyresult;
|
||||
/* Number of tokens to shift before error messages enabled. */
|
||||
int yyerrstatus;
|
||||
@@ -898,12 +898,12 @@
|
||||
/* The state stack. */
|
||||
short int yyssa[YYINITDEPTH];
|
||||
short int *yyss = yyssa;
|
||||
- register short int *yyssp;
|
||||
+ short int *yyssp;
|
||||
|
||||
/* The semantic value stack. */
|
||||
YYSTYPE yyvsa[YYINITDEPTH];
|
||||
YYSTYPE *yyvs = yyvsa;
|
||||
- register YYSTYPE *yyvsp;
|
||||
+ YYSTYPE *yyvsp;
|
||||
|
||||
|
||||
|
||||
@@ -1821,10 +1821,10 @@
|
||||
1972, 1976, 1980, 1984, 1988, 1992, 1996,
|
||||
2000, 2004, 2008, 2012, 2016, 2020, 2024, 2028, 2032, 2036
|
||||
};
|
||||
- register int *yp;
|
||||
- register int *mp;
|
||||
- register time_t Julian;
|
||||
- register int i;
|
||||
+ int *yp;
|
||||
+ int *mp;
|
||||
+ time_t Julian;
|
||||
+ int i;
|
||||
time_t tod;
|
||||
|
||||
if (Year < 0)
|
||||
@@ -1899,12 +1899,12 @@
|
||||
static int
|
||||
LookupWord(buff, length)
|
||||
char *buff;
|
||||
- register int length;
|
||||
+ int length;
|
||||
{
|
||||
- register char *p;
|
||||
- register char *q;
|
||||
- register TABLE *tp;
|
||||
- register int c;
|
||||
+ char *p;
|
||||
+ char *q;
|
||||
+ TABLE *tp;
|
||||
+ int c;
|
||||
|
||||
p = buff;
|
||||
c = p[0];
|
||||
@@ -1991,12 +1991,12 @@
|
||||
int
|
||||
date_lex()
|
||||
{
|
||||
- register char c;
|
||||
- register char *p;
|
||||
+ char c;
|
||||
+ char *p;
|
||||
char buff[20];
|
||||
- register int sign;
|
||||
- register int i;
|
||||
- register int nesting;
|
||||
+ int sign;
|
||||
+ int i;
|
||||
+ int nesting;
|
||||
|
||||
for ( ; ; ) {
|
||||
/* Get first character after the whitespace. */
|
||||
Index: b/src/parsedate.y
|
||||
===================================================================
|
||||
--- a/src/parsedate.y
|
||||
+++ b/src/parsedate.y
|
||||
@@ -492,10 +492,10 @@
|
||||
1972, 1976, 1980, 1984, 1988, 1992, 1996,
|
||||
2000, 2004, 2008, 2012, 2016, 2020, 2024, 2028, 2032, 2036
|
||||
};
|
||||
- register int *yp;
|
||||
- register int *mp;
|
||||
- register time_t Julian;
|
||||
- register int i;
|
||||
+ int *yp;
|
||||
+ int *mp;
|
||||
+ time_t Julian;
|
||||
+ int i;
|
||||
time_t tod;
|
||||
|
||||
if (Year < 0)
|
||||
@@ -570,12 +570,12 @@
|
||||
static int
|
||||
LookupWord(buff, length)
|
||||
char *buff;
|
||||
- register int length;
|
||||
+ int length;
|
||||
{
|
||||
- register char *p;
|
||||
- register char *q;
|
||||
- register TABLE *tp;
|
||||
- register int c;
|
||||
+ char *p;
|
||||
+ char *q;
|
||||
+ TABLE *tp;
|
||||
+ int c;
|
||||
|
||||
p = buff;
|
||||
c = p[0];
|
||||
@@ -662,12 +662,12 @@
|
||||
int
|
||||
date_lex()
|
||||
{
|
||||
- register char c;
|
||||
- register char *p;
|
||||
+ char c;
|
||||
+ char *p;
|
||||
char buff[20];
|
||||
- register int sign;
|
||||
- register int i;
|
||||
- register int nesting;
|
||||
+ int sign;
|
||||
+ int i;
|
||||
+ int nesting;
|
||||
|
||||
for ( ; ; ) {
|
||||
/* Get first character after the whitespace. */
|
||||
Loading…
Reference in new issue