socsvn commit: r270555 - in soc2014/ghostmansd/head/lib/libc/string: . norm

[ghostmansd at FreeBSD.org]

Author: ghostmansd
Date: Mon Jul  7 20:08:26 2014
New Revision: 270555
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=270555

Log:
  several small fixes (mainly typos)
  

Modified:
  soc2014/ghostmansd/head/lib/libc/string/coll.h
  soc2014/ghostmansd/head/lib/libc/string/norm.h
  soc2014/ghostmansd/head/lib/libc/string/norm/compose.h
  soc2014/ghostmansd/head/lib/libc/string/norm/decompose.h
  soc2014/ghostmansd/head/lib/libc/string/norm/hangul.h

Modified: soc2014/ghostmansd/head/lib/libc/string/coll.h
==============================================================================
--- soc2014/ghostmansd/head/lib/libc/string/coll.h	Mon Jul  7 19:31:02 2014	(r270554)
+++ soc2014/ghostmansd/head/lib/libc/string/coll.h	Mon Jul  7 20:08:26 2014	(r270555)
@@ -26,19 +26,21 @@
 
 #ifndef _COLL_H_
 #define _COLL_H_
+#include <stdint.h>
+#include <wchar.h>
 
 
 typedef struct __collation_struct {
-        uint8_t keys_count;
-        uint8_t weights_count;
         wchar_t const *keys_pointer;
         wchar_t const *weights_pointer;
+        uint8_t keys_count;
+        uint8_t weights_count;
 } __collation_struct;
 
 
-#include "ducet/keys.h"
-#include "ducet/weights.h"
-#include "ducet/table.h"
+#include "coll/keys.h"
+#include "coll/weights.h"
+#include "coll/table.h"
 
 
 #endif

Modified: soc2014/ghostmansd/head/lib/libc/string/norm.h
==============================================================================
--- soc2014/ghostmansd/head/lib/libc/string/norm.h	Mon Jul  7 19:31:02 2014	(r270554)
+++ soc2014/ghostmansd/head/lib/libc/string/norm.h	Mon Jul  7 20:08:26 2014	(r270555)
@@ -26,6 +26,7 @@
 
 #ifndef _NORM_H_
 #define _NORM_H_
+#include <string.h>
 #include "norm/hangul.h"
 #include "norm/compose.h"
 #include "norm/decompose.h"
@@ -59,8 +60,6 @@
 static inline size_t __norm_compose(wchar_t *buffer, size_t size,
 				    const wchar_t *str)
 {
-	size_t index = 0;
-	size_t length = 0;
 	size_t reqsize = 0;
 	wchar_t other = 0;
 	wchar_t starter = 0;

Modified: soc2014/ghostmansd/head/lib/libc/string/norm/compose.h
==============================================================================
--- soc2014/ghostmansd/head/lib/libc/string/norm/compose.h	Mon Jul  7 19:31:02 2014	(r270554)
+++ soc2014/ghostmansd/head/lib/libc/string/norm/compose.h	Mon Jul  7 20:08:26 2014	(r270555)
@@ -26,6 +26,7 @@
 
 #ifndef _NORM_COMPOSE_H_
 #define _NORM_COMPOSE_H_
+#include <wchar.h>
 
 
 typedef struct __norm_compose_type {

Modified: soc2014/ghostmansd/head/lib/libc/string/norm/decompose.h
==============================================================================
--- soc2014/ghostmansd/head/lib/libc/string/norm/decompose.h	Mon Jul  7 19:31:02 2014	(r270554)
+++ soc2014/ghostmansd/head/lib/libc/string/norm/decompose.h	Mon Jul  7 20:08:26 2014	(r270555)
@@ -26,6 +26,7 @@
 
 #ifndef _NORM_DECOMPOSE_H_
 #define _NORM_DECOMPOSE_H_
+#include <wchar.h>
 
 
 #define	NORM_STATE_FALSE	-1

Modified: soc2014/ghostmansd/head/lib/libc/string/norm/hangul.h
==============================================================================
--- soc2014/ghostmansd/head/lib/libc/string/norm/hangul.h	Mon Jul  7 19:31:02 2014	(r270554)
+++ soc2014/ghostmansd/head/lib/libc/string/norm/hangul.h	Mon Jul  7 20:08:26 2014	(r270555)
@@ -26,6 +26,7 @@
 
 #ifndef _NORM_HANGUL_H_
 #define	_NORM_HANGUL_H_
+#include <wchar.h>
 
 
 #define	HANGUL_LEAD		(1 << 1)