From 146fe1decfd9fe8760df6d184770d6c8c2a5d994 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Thu, 20 Feb 2020 11:18:29 +1100
Subject: Cleanup: remove use of 'register'

This isn't needed with modern compilers.
---
 source/blender/blenlib/intern/noise.c              |  6 +++---
 source/blender/blenlib/intern/string.c             | 18 +++++++++---------
 source/blender/freestyle/intern/system/RandGen.cpp |  6 +++---
 source/blender/imbuf/intern/targa.c                |  6 +++---
 4 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'source/blender')

diff --git a/source/blender/blenlib/intern/noise.c b/source/blender/blenlib/intern/noise.c
index e388cc06295..229a06948c2 100644
--- a/source/blender/blenlib/intern/noise.c
+++ b/source/blender/blenlib/intern/noise.c
@@ -331,8 +331,8 @@ static float newPerlinU(float x, float y, float z)
 /* Was BLI_hnoise(), removed noisesize, so other functions can call it without scaling. */
 static float orgBlenderNoise(float x, float y, float z)
 {
-  register float cn1, cn2, cn3, cn4, cn5, cn6, i;
-  register const float *h;
+  float cn1, cn2, cn3, cn4, cn5, cn6, i;
+  const float *h;
   float fx, fy, fz, ox, oy, oz, jx, jy, jz;
   float n = 0.5;
   int ix, iy, iz, b00, b01, b10, b11, b20, b21;
@@ -785,7 +785,7 @@ static float noise3_perlin(float vec[3])
   int bx0, bx1, by0, by1, bz0, bz1, b00, b10, b01, b11;
   float rx0, rx1, ry0, ry1, rz0, rz1, sx, sy, sz, a, b, c, d, t, u, v;
   const float *q;
-  register int i, j;
+  int i, j;
 
   SETUP(vec[0], bx0, bx1, rx0, rx1);
   SETUP(vec[1], by0, by1, ry0, ry1);
diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index acc256226d2..7f5b1e7ea65 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -512,8 +512,8 @@ int BLI_strcaseeq(const char *a, const char *b)
  */
 char *BLI_strcasestr(const char *s, const char *find)
 {
-  register char c, sc;
-  register size_t len;
+  char c, sc;
+  size_t len;
 
   if ((c = *find++) != 0) {
     c = tolower(c);
@@ -536,7 +536,7 @@ char *BLI_strcasestr(const char *s, const char *find)
  */
 char *BLI_strncasestr(const char *s, const char *find, size_t len)
 {
-  register char c, sc;
+  char c, sc;
 
   if ((c = *find++) != 0) {
     c = tolower(c);
@@ -567,8 +567,8 @@ char *BLI_strncasestr(const char *s, const char *find, size_t len)
 
 int BLI_strcasecmp(const char *s1, const char *s2)
 {
-  register int i;
-  register char c1, c2;
+  int i;
+  char c1, c2;
 
   for (i = 0;; i++) {
     c1 = tolower(s1[i]);
@@ -590,8 +590,8 @@ int BLI_strcasecmp(const char *s1, const char *s2)
 
 int BLI_strncasecmp(const char *s1, const char *s2, size_t len)
 {
-  register size_t i;
-  register char c1, c2;
+  size_t i;
+  char c1, c2;
 
   for (i = 0; i < len; i++) {
     c1 = tolower(s1[i]);
@@ -669,8 +669,8 @@ static int left_number_strcmp(const char *s1, const char *s2, int *tiebreaker)
  */
 int BLI_strcasecmp_natural(const char *s1, const char *s2)
 {
-  register int d1 = 0, d2 = 0;
-  register char c1, c2;
+  int d1 = 0, d2 = 0;
+  char c1, c2;
   int tiebreaker = 0;
 
   /* if both chars are numeric, to a left_number_strcmp().
diff --git a/source/blender/freestyle/intern/system/RandGen.cpp b/source/blender/freestyle/intern/system/RandGen.cpp
index 719287b102f..d4cd6796a68 100644
--- a/source/blender/freestyle/intern/system/RandGen.cpp
+++ b/source/blender/freestyle/intern/system/RandGen.cpp
@@ -70,10 +70,10 @@ namespace Freestyle {
     (void)0
 
 #  define NEST(TYPE, f, F) \
-    TYPE f(register unsigned short *xsubi) \
+    TYPE f(unsigned short *xsubi) \
     { \
-      register int i; \
-      register TYPE v; \
+      int i; \
+      TYPE v; \
       unsigned temp[3]; \
       for (i = 0; i < 3; i++) { \
         temp[i] = x[i]; \
diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c
index b1077a6ae91..65ae8f8fa4b 100644
--- a/source/blender/imbuf/intern/targa.c
+++ b/source/blender/imbuf/intern/targa.c
@@ -127,9 +127,9 @@ static int tga_out4(unsigned int data, FILE *file)
 
 static bool makebody_tga(ImBuf *ibuf, FILE *file, int (*out)(unsigned int, FILE *))
 {
-  register int last, this;
-  register int copy, bytes;
-  register unsigned int *rect, *rectstart, *temp;
+  int last, this;
+  int copy, bytes;
+  unsigned int *rect, *rectstart, *temp;
   int y;
 
   for (y = 0; y < ibuf->y; y++) {
-- 
cgit v1.2.3