utf8proc

commit e52c8c4c8f0f10aa71c8dbd633a359895157c871
parent 24515cbbe306568fa0a3646f1723b22373b91393
Author: Steven G. Johnson <stevenj@mit.edu>
Date:   Thu, 29 Oct 2015 13:30:56 -0400

Merge pull request #55 from petercolberg/master

Do not export internal unsafe_encode_char()
Diffstat:
M
Makefile
 | 
3
++-
M
test/tests.h
 | 
3
+--
M
utf8proc.c
 | 
2
+-

3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -10,7 +10,8 @@ INSTALL=install
 CFLAGS ?= -O2
 PICFLAG = -fPIC
 C99FLAG = -std=c99
-UCFLAGS = $(CFLAGS) $(PICFLAG) $(C99FLAG) -DUTF8PROC_EXPORTS
+WCFLAGS = -Wall -Wmissing-prototypes -pedantic
+UCFLAGS = $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS
 
 # shared-library version MAJOR.MINOR.PATCH ... this may be *different*
 # from the utf8proc version number because it indicates ABI compatibility,
diff --git a/test/tests.h b/test/tests.h
@@ -33,7 +33,6 @@ size_t skipspaces(const char *buf, size_t i)
    separated by whitespace, and terminated by any character not in
    [0-9a-fA-F] or whitespace, then stores the corresponding utf8 string
    in dest, returning the number of bytes read from buf */
-utf8proc_ssize_t unsafe_encode_char(utf8proc_int32_t uc, utf8proc_uint8_t *dst);
 size_t encode(char *dest, const char *buf)
 {
      size_t i = 0, j, d = 0;
@@ -48,7 +47,7 @@ size_t encode(char *dest, const char *buf)
           }
           check(sscanf(buf + i, "%x", (unsigned int *)&c) == 1, "invalid hex input %s", buf+i);
           i = j; /* skip to char after hex input */
-          d += unsafe_encode_char(c, (utf8proc_uint8_t *) (dest + d));
+          d += utf8proc_encode_char(c, (utf8proc_uint8_t *) (dest + d));
      }
 }
 
diff --git a/utf8proc.c b/utf8proc.c
@@ -188,7 +188,7 @@ UTF8PROC_DLLEXPORT utf8proc_ssize_t utf8proc_encode_char(utf8proc_int32_t uc, ut
 }
 
 /* internal "unsafe" version that does not check whether uc is in range */
-utf8proc_ssize_t unsafe_encode_char(utf8proc_int32_t uc, utf8proc_uint8_t *dst) {
+static utf8proc_ssize_t unsafe_encode_char(utf8proc_int32_t uc, utf8proc_uint8_t *dst) {
    if (uc < 0x00) {
       return 0;
    } else if (uc < 0x80) {