socsvn commit: r269971 - in soc2014/ghostmansd/head: include lib/libc/string lib/libc/string/norm
ghostmansd at FreeBSD.org
ghostmansd at FreeBSD.org
Tue Jun 24 18:34:13 UTC 2014
Author: ghostmansd
Date: Tue Jun 24 18:34:10 2014
New Revision: 269971
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269971
Log:
several style(9) fixes
Modified:
soc2014/ghostmansd/head/include/string.h
soc2014/ghostmansd/head/include/wchar.h
soc2014/ghostmansd/head/lib/libc/string/norm.h
soc2014/ghostmansd/head/lib/libc/string/norm/decompose.h
soc2014/ghostmansd/head/lib/libc/string/norm/hangul.h
soc2014/ghostmansd/head/lib/libc/string/strnorm.c
soc2014/ghostmansd/head/lib/libc/string/wcsnorm.c
Modified: soc2014/ghostmansd/head/include/string.h
==============================================================================
--- soc2014/ghostmansd/head/include/string.h Tue Jun 24 16:10:48 2014 (r269970)
+++ soc2014/ghostmansd/head/include/string.h Tue Jun 24 18:34:10 2014 (r269971)
@@ -144,25 +144,25 @@
/* Unicode Normalization algorithm */
#ifndef _WCHAR_H_
-#define __NORM_NFD 0
-#define __NORM_NFC 1
-#define __NORM_NFKD 2
-#define __NORM_NFKC 3
+#define __NORM_NFD 0
+#define __NORM_NFC 1
+#define __NORM_NFKD 2
+#define __NORM_NFKC 3
#endif
size_t __strnorm(char*, size_t, const char*, int);
size_t __strnorm_l(char*, size_t, const char*, int, locale_t);
#ifdef _UNICODE_ADDENDA
-#define strnorm __strnorm
-#define wcsnorm __wcsnorm
+#define strnorm __strnorm
+#define strnorn_l __strnorm_l
#endif
#if !defined(_WCHAR_H_) && defined(_UNICODE_ADDENDA)
-#define NORM_NFD __NORM_NFD
-#define NORM_NFC __NORM_NFC
-#define NORM_NFKD __NORM_NFKD
-#define NORM_NFKC __NORM_NFKC
+#define NORM_NFD __NORM_NFD
+#define NORM_NFC __NORM_NFC
+#define NORM_NFKD __NORM_NFKD
+#define NORM_NFKC __NORM_NFKC
#endif
__END_DECLS
Modified: soc2014/ghostmansd/head/include/wchar.h
==============================================================================
--- soc2014/ghostmansd/head/include/wchar.h Tue Jun 24 16:10:48 2014 (r269970)
+++ soc2014/ghostmansd/head/include/wchar.h Tue Jun 24 18:34:10 2014 (r269971)
@@ -230,24 +230,24 @@
/* Unicode Normalization Algorithm */
-#ifndef _STRING_H_
-#define __NORM_NFD 0
-#define __NORM_NFC 1
-#define __NORM_NFKD 2
-#define __NORM_NFKC 3
+#ifndef _STRING_H_
+#define __NORM_NFD 0
+#define __NORM_NFC 1
+#define __NORM_NFKD 2
+#define __NORM_NFKC 3
#endif
size_t __wcsnorm(wchar_t*, size_t, const wchar_t*, int);
#ifdef _UNICODE_ADDENDA
-#define wcscoll __wcscoll
+#define wcscoll __wcscoll
#endif
#if !defined(_STRING_H_) && defined(_UNICODE_ADDENDA)
-#define NORM_NFD __NORM_NFD
-#define NORM_NFC __NORM_NFC
-#define NORM_NFKD __NORM_NFKD
-#define NORM_NFKC __NORM_NFKC
+#define NORM_NFD __NORM_NFD
+#define NORM_NFC __NORM_NFC
+#define NORM_NFKD __NORM_NFKD
+#define NORM_NFKC __NORM_NFKC
#endif
__END_DECLS
Modified: soc2014/ghostmansd/head/lib/libc/string/norm.h
==============================================================================
--- soc2014/ghostmansd/head/lib/libc/string/norm.h Tue Jun 24 16:10:48 2014 (r269970)
+++ soc2014/ghostmansd/head/lib/libc/string/norm.h Tue Jun 24 18:34:10 2014 (r269971)
@@ -57,7 +57,7 @@
static inline size_t __norm_compose(wchar_t *buffer, size_t size,
- const wchar_t *str, int compat)
+ const wchar_t *str)
{
size_t index = 0;
size_t length = 0;
@@ -75,17 +75,15 @@
break;
starter = *iter;
if ((buffer != NULL) && (reqsize > size))
- return __norm_compose(NULL, 0, str, compat);
+ return __norm_compose(NULL, 0, str);
/* Hangul script composition normalization algorithm. */
if (((HANGUL_LEAD_MIN <= other) && (other <= HANGUL_LEAD_MAX)) &&
((HANGUL_VOWEL_MIN <= starter) && (starter <= HANGUL_VOWEL_MAX)))
{
other = (HANGUL_BASE \
- + ((other - HANGUL_LEAD_MIN)
- * HANGUL_BASE_COUNT)
- + ((starter - HANGUL_VOWEL_MIN)
- * HANGUL_TRAIL_COUNT));
+ + ((other - HANGUL_LEAD_MIN) * HANGUL_BASE_COUNT)
+ + ((starter - HANGUL_VOWEL_MIN) * HANGUL_TRAIL_COUNT));
}
else if ((__norm_hangul_type(other) == (HANGUL_LEAD | HANGUL_VOWEL)) &&
((HANGUL_TRAIL_MIN <= starter) && (starter <= HANGUL_TRAIL_MAX)))
@@ -173,7 +171,7 @@
if (code < 0x80)
{
if (buffer != NULL)
- *buffer = (wchar_t) code;
+ *buffer = code;
}
/* Hangul script decomposition normalization algorithm. */
Modified: soc2014/ghostmansd/head/lib/libc/string/norm/decompose.h
==============================================================================
--- soc2014/ghostmansd/head/lib/libc/string/norm/decompose.h Tue Jun 24 16:10:48 2014 (r269970)
+++ soc2014/ghostmansd/head/lib/libc/string/norm/decompose.h Tue Jun 24 18:34:10 2014 (r269971)
@@ -28,29 +28,29 @@
#define _NORM_DECOMPOSE_H_
-#define NORM_STATE_FALSE -1
-#define NORM_STATE_NONE 0
-#define NORM_STATE_TRUE +1
+#define NORM_STATE_FALSE -1
+#define NORM_STATE_NONE 0
+#define NORM_STATE_TRUE +1
-#define NORM_TYPE_NONE 0
-#define NORM_TYPE_CAN 1
-#define NORM_TYPE_COM 2
-#define NORM_TYPE_ENC 3
-#define NORM_TYPE_FIN 4
-#define NORM_TYPE_FONT 5
-#define NORM_TYPE_FRA 6
-#define NORM_TYPE_INIT 7
-#define NORM_TYPE_ISO 8
-#define NORM_TYPE_MED 9
-#define NORM_TYPE_NAR 10
-#define NORM_TYPE_NB 11
-#define NORM_TYPE_SML 12
-#define NORM_TYPE_SQR 13
-#define NORM_TYPE_SUB 14
-#define NORM_TYPE_SUP 15
-#define NORM_TYPE_VERT 16
-#define NORM_TYPE_WIDE 17
+#define NORM_TYPE_NONE 0
+#define NORM_TYPE_CAN 1
+#define NORM_TYPE_COM 2
+#define NORM_TYPE_ENC 3
+#define NORM_TYPE_FIN 4
+#define NORM_TYPE_FONT 5
+#define NORM_TYPE_FRA 6
+#define NORM_TYPE_INIT 7
+#define NORM_TYPE_ISO 8
+#define NORM_TYPE_MED 9
+#define NORM_TYPE_NAR 10
+#define NORM_TYPE_NB 11
+#define NORM_TYPE_SML 12
+#define NORM_TYPE_SQR 13
+#define NORM_TYPE_SUB 14
+#define NORM_TYPE_SUP 15
+#define NORM_TYPE_VERT 16
+#define NORM_TYPE_WIDE 17
typedef struct __norm_decompose_type {
Modified: soc2014/ghostmansd/head/lib/libc/string/norm/hangul.h
==============================================================================
--- soc2014/ghostmansd/head/lib/libc/string/norm/hangul.h Tue Jun 24 16:10:48 2014 (r269970)
+++ soc2014/ghostmansd/head/lib/libc/string/norm/hangul.h Tue Jun 24 18:34:10 2014 (r269971)
@@ -25,31 +25,31 @@
*/
#ifndef _NORM_HANGUL_H_
-#define _NORM_HANGUL_H_
+#define _NORM_HANGUL_H_
-#define HANGUL_LEAD (1 << 1)
-#define HANGUL_VOWEL (1 << 2)
-#define HANGUL_TRAIL (1 << 3)
+#define HANGUL_LEAD (1 << 1)
+#define HANGUL_VOWEL (1 << 2)
+#define HANGUL_TRAIL (1 << 3)
-#define HANGUL_MIN 0xAC00
-#define HANGUL_MAX 0xD7A4
-#define HANGUL_BASE HANGUL_MIN
+#define HANGUL_MIN 0xAC00
+#define HANGUL_MAX 0xD7A4
+#define HANGUL_BASE HANGUL_MIN
-#define HANGUL_LEAD_COUNT 19
-#define HANGUL_VOWEL_COUNT 21
-#define HANGUL_TRAIL_COUNT 28
+#define HANGUL_LEAD_COUNT 19
+#define HANGUL_VOWEL_COUNT 21
+#define HANGUL_TRAIL_COUNT 28
-#define HANGUL_LEAD_MIN 0x1100
-#define HANGUL_VOWEL_MIN 0x1161
-#define HANGUL_TRAIL_MIN 0x11A7
+#define HANGUL_LEAD_MIN 0x1100
+#define HANGUL_VOWEL_MIN 0x1161
+#define HANGUL_TRAIL_MIN 0x11A7
-#define HANGUL_LEAD_MAX ((HANGUL_LEAD_MIN + HANGUL_LEAD_COUNT) - 1)
-#define HANGUL_VOWEL_MAX ((HANGUL_VOWEL_MIN + HANGUL_VOWEL_COUNT) - 1)
-#define HANGUL_TRAIL_MAX ((HANGUL_TRAIL_MIN + HANGUL_TRAIL_COUNT) - 1)
+#define HANGUL_LEAD_MAX ((HANGUL_LEAD_MIN + HANGUL_LEAD_COUNT) - 1)
+#define HANGUL_VOWEL_MAX ((HANGUL_VOWEL_MIN + HANGUL_VOWEL_COUNT) - 1)
+#define HANGUL_TRAIL_MAX ((HANGUL_TRAIL_MIN + HANGUL_TRAIL_COUNT) - 1)
-#define HANGUL_BASE_COUNT 588
-#define HANGUL_FULL_COUNT 11172
+#define HANGUL_BASE_COUNT 588
+#define HANGUL_FULL_COUNT 11172
/*
@@ -179,13 +179,13 @@
if (((0x1100 <= code) && (code <= 0x115F)) ||
((0xA960 <= code) && (code <= 0xA97C)))
- return HANGUL_LEAD;
+ return (HANGUL_LEAD);
if (((0x1160 <= code) && (code <= 0x11A7)) ||
((0xD7B0 <= code) && (code <= 0xD7C6)))
- return HANGUL_VOWEL;
+ return (HANGUL_VOWEL);
if (((0x11A8 <= code) && (code <= 0x11FF)) ||
((0xD7CB <= code) && (code <= 0xD7FB)))
- return HANGUL_TRAIL;
+ return (HANGUL_TRAIL);
for (ptr = __hangul_lead_vowel; *ptr != 0xFFFF; ++ptr)
{
if (*ptr == code)
@@ -196,7 +196,7 @@
if ((ptr[0] <= code) && (code <= ptr[1]))
return (HANGUL_LEAD | HANGUL_VOWEL | HANGUL_TRAIL);
}
- return 0;
+ return (0);
}
Modified: soc2014/ghostmansd/head/lib/libc/string/strnorm.c
==============================================================================
--- soc2014/ghostmansd/head/lib/libc/string/strnorm.c Tue Jun 24 16:10:48 2014 (r269970)
+++ soc2014/ghostmansd/head/lib/libc/string/strnorm.c Tue Jun 24 18:34:10 2014 (r269971)
@@ -67,9 +67,9 @@
FIX_LOCALE(locale);
length = mbsrtowcs_l(NULL, &mbs, 0, &state, locale);
if (length == ((size_t)-1))
- return NULL;
+ return (NULL);
if ((wcs = malloc((length + 1) * sizeof(wchar_t))) == NULL)
- return NULL;
+ return (NULL);
mbsrtowcs_l(wcs, &str, length, &state, locale);
wcs[length] = 0;
state = initial;
@@ -77,6 +77,14 @@
}
+#define __strnorm_failure() \
+do { \
+ error = errno; \
+ free(wbuffer); \
+ free(wstr); \
+ errno = error; \
+ return 0; \
+} while (0)
size_t __strnorm_l(char *buffer, size_t size, const char *str, int form,
locale_t locale)
{
@@ -87,15 +95,6 @@
wchar_t *wstr = NULL;
wchar_t *wbuffer = NULL;
-#define __strnorm_failure() \
-do { \
- error = errno; \
- free(wbuffer); \
- free(wstr); \
- errno = error; \
- return 0; \
-} while (0)
-
/* Check initial arguments. */
if ((str == NULL) || ((buffer != NULL) && (size == 0)))
{
@@ -138,6 +137,7 @@
errno = error;
return reqsize;
}
+#undef __strnorm_failure
size_t __strnorm(char *buffer, size_t size, const char *str, int form)
Modified: soc2014/ghostmansd/head/lib/libc/string/wcsnorm.c
==============================================================================
--- soc2014/ghostmansd/head/lib/libc/string/wcsnorm.c Tue Jun 24 16:10:48 2014 (r269970)
+++ soc2014/ghostmansd/head/lib/libc/string/wcsnorm.c Tue Jun 24 18:34:10 2014 (r269971)
@@ -49,11 +49,11 @@
case __NORM_NFD:
return __norm_decompose(buffer, size, str, 0);
case __NORM_NFC:
- return __norm_compose(buffer, size, str, 0);
+ return __norm_compose(buffer, size, str);
case __NORM_NFKD:
return __norm_decompose(buffer, size, str, 1);
case __NORM_NFKC:
- return __norm_compose(buffer, size, str, 1);
+ return __norm_compose(buffer, size, str);
default:
errno = EINVAL;
return (0);
More information about the svn-soc-all
mailing list