Convert all u_int to ISO uint

[netatalk.git] / libatalk / unicode / charsets / mac_chinese_trad.c

diff --git a/libatalk/unicode/charsets/mac_chinese_trad.c b/libatalk/unicode/charsets/mac_chinese_trad.c
index 7412beeccb421e1e5527a60f518c530cc36176d6..116e8cd5e3f88d905a50ab0c3e1c181ed3048a95 100644 (file)
--- a/libatalk/unicode/charsets/mac_chinese_trad.c
+++ b/libatalk/unicode/charsets/mac_chinese_trad.c
@@ -43,7 +43,7 @@ struct charset_functions charset_mac_chinese_trad = {
   NULL, NULL
 };
 
-static size_t mac_chinese_trad_char_push(u_int8_t* out, const ucs2_t* in, size_t* size)
+static size_t mac_chinese_trad_char_push(uint8_t* out, const ucs2_t* in, size_t* size)
 {
   ucs2_t wc = in[0];
 
@@ -53,7 +53,7 @@ static size_t mac_chinese_trad_char_push(u_int8_t* out, const ucs2_t* in, size_t
       out[0] = 0x80;
     } else {
       *size = 1;
-      out[0] = (u_int8_t)wc;
+      out[0] = (uint8_t)wc;
     }
     return 1;
   } else if ((wc & 0xf000) == 0xe000) {
@@ -61,7 +61,7 @@ static size_t mac_chinese_trad_char_push(u_int8_t* out, const ucs2_t* in, size_t
     return 0;
   } else if (*size >= 2 && (in[1] & ~15) == 0xf870) {
     ucs2_t comp = cjk_compose(wc, in[1], mac_chinese_trad_compose,
-                             sizeof(mac_chinese_trad_compose) / sizeof(u_int32_t));
+                             sizeof(mac_chinese_trad_compose) / sizeof(uint32_t));
     if (comp) {
       wc = comp;
       *size = 2;
@@ -82,9 +82,9 @@ static size_t mac_chinese_trad_push(void *cd, char **inbuf, size_t *inbytesleft,
                          cd, inbuf, inbytesleft, outbuf, outbytesleft);
 }
 
-static size_t mac_chinese_trad_char_pull(ucs2_t* out, const u_int8_t* in, size_t* size)
+static size_t mac_chinese_trad_char_pull(ucs2_t* out, const uint8_t* in, size_t* size)
 {
-  u_int16_t c = in[0];
+  uint16_t c = in[0];
 
   if (c <= 0x7f) {
     *size = 1;
@@ -92,7 +92,7 @@ static size_t mac_chinese_trad_char_pull(ucs2_t* out, const u_int8_t* in, size_t
     return 1;
   } else if (c >= 0xa1 && c <= 0xfc) {
     if (*size >= 2) {
-      u_int8_t c2 = in[1];
+      uint8_t c2 = in[1];
 
       if ((c2 >= 0x40 && c2 <= 0x7e) || (c2 >= 0xa1 && c2 <= 0xfe)) {
        *size = 2;