openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File deregister.patch of Package cdo (Revision 36b6c51c4dbf3e25ee3af9d271bdd1c1)

Currently displaying revision 36b6c51c4dbf3e25ee3af9d271bdd1c1 , Show latest

Author: Alastair McKinstry <mckinstry@debian.org>
Bugs-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790393
Description: Remove 'register' from C code. Especially never try to get the
 address of a register. Breaks HPPA code at least, and compilers do this
 better in the 21st century.

diff -Nupr cdo-2.0.6.orig/libcdi/src/cdilib.c cdo-2.0.6/libcdi/src/cdilib.c
--- cdo-2.0.6.orig/libcdi/src/cdilib.c	2021-06-05 08:43:11.000000000 +0200
+++ cdo-2.0.6/libcdi/src/cdilib.c	2022-08-16 13:31:22.499285236 +0200
@@ -8209,8 +8209,8 @@ void pwr6_minmax_val_double_unrolled6(co
     size_t i, j;
     size_t residual =  datasize % __UNROLL_DEPTH_1;
     size_t ofs = datasize - residual;
-    double register dmin[__UNROLL_DEPTH_1];
-    double register dmax[__UNROLL_DEPTH_1];
+    double dmin[__UNROLL_DEPTH_1];
+    double dmax[__UNROLL_DEPTH_1];
 
     for ( j = 0; j < __UNROLL_DEPTH_1; j++) 
       {
@@ -20565,7 +20565,7 @@ memcrc(const unsigned char *b, size_t n)
 
   /* Extend with the length of the string. */
   while (n != 0) {
-    register uint32_t c = n & 0377;
+    uint32_t c = n & 0377;
     n >>= 8;
     s = (s << 8) ^ crctab[(s >> 24) ^ c];
   }
@@ -20583,9 +20583,9 @@ memcrc_r(uint32_t *state, const unsigned
  */
 
 
-  register uint32_t c, s = *state;
-  register size_t n = block_len;
-  register const unsigned char *b = block;
+  uint32_t c, s = *state;
+  size_t n = block_len;
+  const unsigned char *b = block;
 
   for (; n > 0; --n) {
     c = (uint32_t)(*b++);
@@ -20598,7 +20598,7 @@ memcrc_r(uint32_t *state, const unsigned
 #ifdef WORDS_BIGENDIAN
 #define SWAP_CSUM(BITWIDTH,BYTEWIDTH,NACC)                              \
   do {                                                                  \
-    register const uint##BITWIDTH##_t *b = (uint##BITWIDTH##_t *)elems; \
+    const uint##BITWIDTH##_t *b = (uint##BITWIDTH##_t *)elems; \
     for (size_t i = 0; i < num_elems; ++i) {                            \
       for(size_t aofs = NACC; aofs > 0; --aofs) {                       \
         uint##BITWIDTH##_t accum = b[i + aofs - 1];                     \
@@ -20625,7 +20625,7 @@ memcrc_r_eswap(uint32_t *state, const un
                size_t elem_size)
 {
 #ifdef WORDS_BIGENDIAN
-  register uint32_t s = *state;
+  uint32_t s = *state;
 
   switch (elem_size)
   {
@@ -20655,8 +20655,8 @@ memcrc_r_eswap(uint32_t *state, const un
 uint32_t
 memcrc_finish(uint32_t *state, off_t total_size)
 {
-  register uint32_t c, s = *state;
-  register uint64_t n = (uint64_t)total_size;
+  uint32_t c, s = *state;
+  uint64_t n = (uint64_t)total_size;
 
   /* Extend with the length of the string. */
   while (n != 0) {
diff -Nupr cdo-2.0.6.orig/libcdi/src/cgribexlib.c cdo-2.0.6/libcdi/src/cgribexlib.c
--- cdo-2.0.6.orig/libcdi/src/cgribexlib.c	2022-05-25 15:46:13.000000000 +0200
+++ cdo-2.0.6/libcdi/src/cgribexlib.c	2022-08-16 13:32:01.251405811 +0200
@@ -737,8 +737,8 @@ void pwr6_minmax_val_double_unrolled6(co
   {
     size_t residual =  datasize % __UNROLL_DEPTH_1;
     size_t ofs = datasize - residual;
-    double register dmin[__UNROLL_DEPTH_1];
-    double register dmax[__UNROLL_DEPTH_1];
+    double dmin[__UNROLL_DEPTH_1];
+    double dmax[__UNROLL_DEPTH_1];
 
     for (size_t j = 0; j < __UNROLL_DEPTH_1; ++j) 
       {
diff -Nupr cdo-2.0.6.orig/libcdi/src/cksum.c cdo-2.0.6/libcdi/src/cksum.c
--- cdo-2.0.6.orig/libcdi/src/cksum.c	2022-01-21 09:38:53.000000000 +0100
+++ cdo-2.0.6/libcdi/src/cksum.c	2022-08-16 13:32:32.719503735 +0200
@@ -54,7 +54,7 @@ memcrc(const unsigned char *b, size_t n)
   /* Extend with the length of the string. */
   while (n != 0)
     {
-      register uint32_t c = n & 0377;
+      uint32_t c = n & 0377;
       n >>= 8;
       s = (s << 8) ^ crctab[(s >> 24) ^ c];
     }
@@ -70,9 +70,9 @@ memcrc_r(uint32_t *state, const unsigned
    *  size_t        n == length of sequence
    */
 
-  register uint32_t c, s = *state;
-  register size_t n = block_len;
-  register const unsigned char *b = block;
+  uint32_t c, s = *state;
+  size_t n = block_len;
+  const unsigned char *b = block;
 
   for (; n > 0; --n)
     {
@@ -87,7 +87,7 @@ memcrc_r(uint32_t *state, const unsigned
 #define SWAP_CSUM(BITWIDTH, BYTEWIDTH, NACC)                               \
   do                                                                       \
     {                                                                      \
-      register const uint##BITWIDTH##_t *b = (uint##BITWIDTH##_t *) elems; \
+      const uint##BITWIDTH##_t *b = (uint##BITWIDTH##_t *) elems; \
       for (size_t i = 0; i < num_elems; ++i)                               \
         {                                                                  \
           for (size_t aofs = NACC; aofs > 0; --aofs)                       \
@@ -116,7 +116,7 @@ void
 memcrc_r_eswap(uint32_t *state, const unsigned char *elems, size_t num_elems, size_t elem_size)
 {
 #ifdef WORDS_BIGENDIAN
-  register uint32_t s = *state;
+  uint32_t s = *state;
 
   switch (elem_size)
     {
@@ -135,8 +135,8 @@ memcrc_r_eswap(uint32_t *state, const un
 uint32_t
 memcrc_finish(uint32_t *state, off_t total_size)
 {
-  register uint32_t c, s = *state;
-  register uint64_t n = (uint64_t) total_size;
+  uint32_t c, s = *state;
+  uint64_t n = (uint64_t) total_size;
 
   /* Extend with the length of the string. */
   while (n != 0)

Places

File deregister.patch of Package cdo (Revision 36b6c51c4dbf3e25ee3af9d271bdd1c1)

Places