Skip to content

Commit

Permalink
Reduce dependencies of k5-input.h
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
greghudson committed Apr 18, 2017
1 parent 1ae8878 commit dbef916
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/include/k5-input.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -45,7 +45,7 @@
struct k5input {
const unsigned char *ptr;
size_t len;
krb5_error_code status;
int32_t status;
};

static inline void
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/krb5/ccache/ccmarshal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.*/
Expand Down

0 comments on commit dbef916

Please sign in to comment.