change int16 to ui_2

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1124 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/ccache/file/fcc-proto.h b/src/lib/krb5/ccache/file/fcc-proto.h
index 2e5d4f134a5070431f26abb1afabfc4eefdfb7d3..6ad69a96f541598273b62a27ba1a0adc7d9a2b59 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc-proto.h
+++ b/src/lib/krb5/ccache/file/fcc-proto.h
@@ -48,7 +48,7 @@ krb5_error_code krb5_fcc_read_principal PROTOTYPE((krb5_ccache id , krb5_princip
 krb5_error_code krb5_fcc_read_keyblock PROTOTYPE((krb5_ccache id , krb5_keyblock *keyblock ));
 krb5_error_code krb5_fcc_read_data PROTOTYPE((krb5_ccache id , krb5_data *data ));
 krb5_error_code krb5_fcc_read_int32 PROTOTYPE((krb5_ccache id , krb5_int32 *i ));
-krb5_error_code krb5_fcc_read_int16 PROTOTYPE((krb5_ccache id , krb5_int16 *i ));
+krb5_error_code krb5_fcc_read_ui_2 PROTOTYPE((krb5_ccache id , krb5_ui_2 *i ));
 krb5_error_code krb5_fcc_read_keytype PROTOTYPE((krb5_ccache id , krb5_keytype *k ));
 krb5_error_code krb5_fcc_read_int PROTOTYPE((krb5_ccache id , int *i ));
 krb5_error_code krb5_fcc_read_bool PROTOTYPE((krb5_ccache id , krb5_boolean *b ));

diff --git a/src/lib/krb5/ccache/file/fcc_read.c b/src/lib/krb5/ccache/file/fcc_read.c
index f69a368386199b5dfde7e3c7dec546e8cdbc6d68..33770cd7a9dddb9b8b3c5c2aa4558177448bfa76 100644 (file)
--- a/src/lib/krb5/ccache/file/fcc_read.c
+++ b/src/lib/krb5/ccache/file/fcc_read.c
@@ -229,7 +229,7 @@ krb5_fcc_read_addr(id, addr)
 
      addr->contents = 0;
 
-     kret = krb5_fcc_read_int16(id, &addr->addrtype);
+     kret = krb5_fcc_read_ui_2(id, &addr->addrtype);
      CHECK(kret);
 
      kret = krb5_fcc_read_int(id, &addr->length);
@@ -265,11 +265,11 @@ krb5_fcc_read_int32(id, i)
 }
 
 krb5_error_code
-krb5_fcc_read_int16(id, i)
+krb5_fcc_read_ui_2(id, i)
    krb5_ccache id;
-   krb5_int16 *i;
+   krb5_ui_2 *i;
 {
-     return krb5_fcc_read(id, (krb5_pointer) i, sizeof(krb5_int16));
+     return krb5_fcc_read(id, (krb5_pointer) i, sizeof(krb5_ui_2));
 }
 
 krb5_error_code