[v3,06/19] sysv/linux: riscv: Fix dl-cache.h indentation

Message ID 780c989c666abbabca7e13123fe876a3eaa73aef.1594568655.git.alistair.francis@wdc.com
State Committed
Headers
Series glibc port for 32-bit RISC-V (RV32) |

Commit Message

Alistair Francis July 12, 2020, 3:47 p.m. UTC
  Replace 8 spaces with a tabi and extend the line length in preperation
for the next patch. No functional changes.
---
 sysdeps/unix/sysv/linux/riscv/dl-cache.h | 62 ++++++++++++------------
 1 file changed, 31 insertions(+), 31 deletions(-)
  

Comments

Maciej W. Rozycki July 16, 2020, 6:31 a.m. UTC | #1
On Sun, 12 Jul 2020, Alistair Francis via Libc-alpha wrote:

> Replace 8 spaces with a tabi and extend the line length in preperation
> for the next patch. No functional changes.

 I don't think this change is needed; there was nothing wrong with the 
original formatting except for this line:

> -  do							    		\

which has a couple of spaces embedded between tabs, and which I haven't 
considered worth fixing on this occassion (there's another such line 
earlier in this file too).  The new version extends beyond 80 columns 
though, and does not follow the GNU coding standard WRT indentation.

 Please drop it then.

  Maciej
  

Patch

diff --git a/sysdeps/unix/sysv/linux/riscv/dl-cache.h b/sysdeps/unix/sysv/linux/riscv/dl-cache.h
index c297dfe84f..b3cda4ef9f 100644
--- a/sysdeps/unix/sysv/linux/riscv/dl-cache.h
+++ b/sysdeps/unix/sysv/linux/riscv/dl-cache.h
@@ -38,37 +38,37 @@ 
    so this will add all of those paths.
 
    According to Joseph Myers:
-       My reasoning for that would be: generic autoconf-configured (etc.)
-       software may only know about using the lib directory, so you want the
-       lib directory to be searched regardless of the ABI - but it's also
-       useful to be able to e.g. list /usr/local/lib in /etc/ld.so.conf for all
-       architectures and have that automatically imply /usr/local/lib64/lp64d
-       etc. so that libraries can be found that come from software that does
-       use the ABI-specific directories.  */
-#define add_system_dir(dir) 						\
-  do							    		\
-    {									\
-      size_t len = strlen (dir);					\
-      char path[len + 9];						\
-      memcpy (path, dir, len + 1);					\
-      if (len >= 12 && ! memcmp(path + len - 12, "/lib64/lp64d", 12))	\
-	{								\
-	  len -= 8;							\
-	  path[len] = '\0';						\
-	}								\
-      if (len >= 11 && ! memcmp(path + len - 11, "/lib64/lp64", 11))	\
-	{								\
-	  len -= 7;							\
-	  path[len] = '\0';						\
-	}								\
-      add_dir (path);							\
-      if (len >= 4 && ! memcmp(path + len - 4, "/lib", 4))		\
-	{								\
-	  memcpy (path + len, "64/lp64d", 9);				\
-	  add_dir (path);						\
-	  memcpy (path + len, "64/lp64", 8);				\
-	  add_dir (path);						\
-	}								\
+	 My reasoning for that would be: generic autoconf-configured (etc.)
+	 software may only know about using the lib directory, so you want the
+	 lib directory to be searched regardless of the ABI - but it's also
+	 useful to be able to e.g. list /usr/local/lib in /etc/ld.so.conf for all
+	 architectures and have that automatically imply /usr/local/lib64/lp64d
+	 etc. so that libraries can be found that come from software that does
+	 use the ABI-specific directories.  */
+#define add_system_dir(dir) 									\
+  do							    					\
+    {												\
+	size_t len = strlen (dir);								\
+	char path[len + 9];									\
+	memcpy (path, dir, len + 1);								\
+	if (len >= 12 && ! memcmp(path + len - 12, "/lib64/lp64d", 12))				\
+	{											\
+	  len -= 8;										\
+	  path[len] = '\0';									\
+	}											\
+	if (len >= 11 && ! memcmp(path + len - 11, "/lib64/lp64", 11))				\
+	{											\
+	  len -= 7;										\
+	  path[len] = '\0';									\
+	}											\
+	add_dir (path);										\
+	if (len >= 4 && ! memcmp(path + len - 4, "/lib", 4))					\
+	{											\
+	  memcpy (path + len, "64/lp64d", 9);							\
+	  add_dir (path);									\
+	  memcpy (path + len, "64/lp64", 8);							\
+	  add_dir (path);									\
+	}											\
     } while (0)