Convert all u_int to ISO uint

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

diff --git a/libatalk/unicode/charsets/mac_japanese.c b/libatalk/unicode/charsets/mac_japanese.c
index b78ce01416a6453c97761f20c25eafb899387b62..9f32f66246f7fbe0bfcd59dd3d732a853a186a6f 100644 (file)
--- a/libatalk/unicode/charsets/mac_japanese.c
+++ b/libatalk/unicode/charsets/mac_japanese.c
@@ -43,29 +43,29 @@ struct charset_functions charset_mac_japanese = {
   NULL, NULL
 };
 
-static size_t mac_japanese_char_push(u_int8_t* out, const ucs2_t* in, size_t* size)
+static size_t mac_japanese_char_push(uint8_t* out, const ucs2_t* in, size_t* size)
 {
   ucs2_t wc = in[0];
 
   if (wc <= 0x7f) {
     *size = 1;
-    out[0] = (u_int8_t)(wc == 0x5c ? 0x80 : wc);
+    out[0] = (uint8_t)(wc == 0x5c ? 0x80 : wc);
     return 1;
   } else if ((wc & 0xf000) == 0xe000) { /* user defined */
     *size = 1;
     if (wc > 0xe98b) return 0;
     wc -= 0xe000;
-    out[0] = (u_int8_t)(wc / 188 + 0xf0);
-    out[1] = (u_int8_t)(wc % 188 + 0x40);
+    out[0] = (uint8_t)(wc / 188 + 0xf0);
+    out[1] = (uint8_t)(wc % 188 + 0x40);
     if (out[1] >= 0x7f) ++out[1];
     return 2;
   } else if ((wc & ~7) == 0xf860) {
     wc = cjk_compose_seq(in, size, mac_japanese_compose,
-                        sizeof(mac_japanese_compose) / sizeof(u_int32_t));
+                        sizeof(mac_japanese_compose) / sizeof(uint32_t));
     if (!wc) return (size_t)-1;
   } else if (*size >= 2 && ((in[1] & ~15) == 0xf870 || in[1] == 0x20dd)) {
     ucs2_t comp = cjk_compose(wc, in[1], mac_japanese_compose,
-                             sizeof(mac_japanese_compose) / sizeof(u_int32_t));
+                             sizeof(mac_japanese_compose) / sizeof(uint32_t));
     if (comp) {
       wc = comp;
       *size = 2;
@@ -86,9 +86,9 @@ static size_t mac_japanese_push(void *cd, char **inbuf, size_t *inbytesleft,
                          cd, inbuf, inbytesleft, outbuf, outbytesleft);
 }
 
-static size_t mac_japanese_char_pull(ucs2_t* out, const u_int8_t* in, size_t* size)
+static size_t mac_japanese_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;
@@ -96,7 +96,7 @@ static size_t mac_japanese_char_pull(ucs2_t* out, const u_int8_t* in, size_t* si
     return 1;
   } else if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)) {
     if (*size >= 2) {
-      u_int8_t c2 = in[1];
+      uint8_t c2 = in[1];
 
       if ((c2 >= 0x40 && c2 <= 0x7e) || (c2 >= 0x80 && c2 <= 0xfc)) {
        *size = 2;