[PATCH] ntdll/tests: Make RtlIpv6AddressToString test data static and constant

[Alex Henrie]

Signed-off-by: Alex Henrie 
---
 dlls/ntdll/tests/rtl.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
index 94c6b582f3..7a62670ea0 100644
--- a/dlls/ntdll/tests/rtl.c
+++ b/dlls/ntdll/tests/rtl.c
@@ -1711,7 +1711,7 @@ static void test_RtlIpv6AddressToString(void)
     LPCSTR result;
     IN6_ADDR ip;
     DWORD_PTR len;
-    struct
+    static const struct
     {
         PCSTR address;
         int ip[8];
@@ -1835,7 +1835,7 @@ static void test_RtlIpv6AddressToStringEx(void)
     NTSTATUS res;
     IN6_ADDR ip;
     ULONG len;
-    struct
+    static const struct
     {
         PCSTR address;
         ULONG scopeid;

[PATCH] libport: Get rid of ffs

[Alex Henrie]

Signed-off-by: Alex Henrie 
---
This function is no longer used in Wine, and __builtin_ffs or
RtlFindLeastSignificantBit can be used instead when writing new code.
---
 libs/port/Makefile.in |  1 -
 libs/port/ffs.c       | 64 -------------------------------------------
 2 files changed, 65 deletions(-)
 delete mode 100644 libs/port/ffs.c

diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 7bc67fa3fe..e66b0033ab 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -2,7 +2,6 @@ STATICLIB = libwine_port.a

C_SRCS = \
    casemap.c \
-	ffs.c \
    fstatvfs.c \
    getopt.c \
    isfinite.c \
diff --git a/libs/port/ffs.c b/libs/port/ffs.c
deleted file mode 100644
index 76330559b5..0000000000
--- a/libs/port/ffs.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * ffs function
- *
- * Copyright 2004 Hans Leidekker
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "config.h"
-#include "wine/port.h"
-
-#ifndef HAVE_FFS
-int ffs( int x )
-{
-    unsigned int y = (unsigned int)x;
-
-    if (y & 0x00000001) return 1;
-    if (y & 0x00000002) return 2;
-    if (y & 0x00000004) return 3;
-    if (y & 0x00000008) return 4;
-    if (y & 0x00000010) return 5;
-    if (y & 0x00000020) return 6;
-    if (y & 0x00000040) return 7;
-    if (y & 0x00000080) return 8;
-    if (y & 0x00000100) return 9;
-    if (y & 0x00000200) return 10;
-    if (y & 0x00000400) return 11;
-    if (y & 0x00000800) return 12;
-    if (y & 0x00001000) return 13;
-    if (y & 0x00002000) return 14;
-    if (y & 0x00004000) return 15;
-    if (y & 0x00008000) return 16;
-    if (y & 0x00010000) return 17;
-    if (y & 0x00020000) return 18;
-    if (y & 0x00040000) return 19;
-    if (y & 0x00080000) return 20;
-    if (y & 0x00100000) return 21;
-    if (y & 0x00200000) return 22;
-    if (y & 0x00400000) return 23;
-    if (y & 0x00800000) return 24;
-    if (y & 0x01000000) return 25;
-    if (y & 0x02000000) return 26;
-    if (y & 0x04000000) return 27;
-    if (y & 0x08000000) return 28;
-    if (y & 0x10000000) return 29;
-    if (y & 0x20000000) return 30;
-    if (y & 0x40000000) return 31;
-    if (y & 0x80000000) return 32;
-
-    return 0;
-}
-#endif /* HAVE_FFS */

[PATCH] libport: Get rid of ffs

[Alexandre Julliard]

Alex Henrie  writes:
> Signed-off-by: Alex Henrie
>
> This function is no longer used in Wine, and __builtin_ffs or
> RtlFindLeastSignificantBit can be used instead when writing new code.

It's still used in gdi32.

[PATCH] libport: Get rid of ffs

[Alex Henrie]

On Thu, May 28, 2020 at 12:11 PM Alexandre Julliard  wrote:
> Alex Henrie  writes:
> > Signed-off-by: Alex Henrie
> >
> > This function is no longer used in Wine, and __builtin_ffs or
> > RtlFindLeastSignificantBit can be used instead when writing new code.
>
> It's still used in gdi32.

You're right, thanks for catching that. Do you think it would be
better to use RtlFindLeastSignificantBit in gdi32 or is it better off
using the system ffs function?

-Alex

[PATCH] libport: Get rid of ffs

[Alexandre Julliard]

Alex Henrie  writes:
> On Thu, May 28, 2020 at 12:11 PM Alexandre Julliard  wrote:
> > Alex Henrie  writes:
> > > Signed-off-by: Alex Henrie
> > >
> > > This function is no longer used in Wine, and __builtin_ffs or
> > > RtlFindLeastSignificantBit can be used instead when writing new code.
> >
> > It's still used in gdi32.
>
> You're right, thanks for catching that. Do you think it would be
> better to use RtlFindLeastSignificantBit in gdi32 or is it better off
> using the system ffs function?

If you want to convert it to RtlFindLeastSignificantBit that's fine.