diff options
| author | Greg Hudson <ghudson@mit.edu> | 2017-04-18 12:33:48 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2017-04-18 12:33:48 -0400 |
| commit | dbef9160fe060959df6b769492ff6e544e07a723 (patch) | |
| tree | af207d3d856213d51412c670d3720ce946fc8ff1 | |
| parent | 1ae8878998788405bfcd489715008badb69b55ac (diff) | |
| download | krb5-dbef9160fe060959df6b769492ff6e544e07a723.zip krb5-dbef9160fe060959df6b769492ff6e544e07a723.tar.gz krb5-dbef9160fe060959df6b769492ff6e544e07a723.tar.bz2 | |
Reduce dependencies of k5-input.h
Avoid using the krb5_error_code type (using int32_t instead), and
include k5-platform.h instead of k5-int.h, so that we can use
k5-input.h in libkrb5support.
| -rw-r--r-- | src/include/k5-input.h | 6 | ||||
| -rw-r--r-- | src/lib/krb5/ccache/ccmarshal.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/include/k5-input.h b/src/include/k5-input.h index d42ebce..9f47fa7 100644 --- a/src/include/k5-input.h +++ b/src/include/k5-input.h @@ -33,7 +33,7 @@ #ifndef K5_INPUT_H #define K5_INPUT_H -#include "k5-int.h" +#include "k5-platform.h" /* * The k5input module defines helpers for safely consuming a fixed-sized block @@ -45,7 +45,7 @@ struct k5input { const unsigned char *ptr; size_t len; - krb5_error_code status; + int32_t status; }; static inline void @@ -59,7 +59,7 @@ k5_input_init(struct k5input *in, const void *ptr, size_t len) /* Only set the status value of in if it hasn't already been set, so status * reflects the first thing to go wrong. */ static inline void -k5_input_set_status(struct k5input *in, krb5_error_code status) +k5_input_set_status(struct k5input *in, int32_t status) { if (!in->status) in->status = status; diff --git a/src/lib/krb5/ccache/ccmarshal.c b/src/lib/krb5/ccache/ccmarshal.c index bd6d309..ae634cc 100644 --- a/src/lib/krb5/ccache/ccmarshal.c +++ b/src/lib/krb5/ccache/ccmarshal.c @@ -100,8 +100,8 @@ * second value when reading it. */ -#include "k5-input.h" #include "cc-int.h" +#include "k5-input.h" /* Read a 16-bit integer in host byte order for versions 1 and 2, or in * big-endian byte order for later versions.*/ |