From 5cdd407c8d4037bec1144b8d7f6fed09953c9d60 Mon Sep 17 00:00:00 2001 From: franklahm Date: Tue, 24 Nov 2009 08:59:25 +0000 Subject: [PATCH] Fix type mismatches --- libatalk/cnid/mtab/cnid_mtab.c | 12 ++++++------ libatalk/cnid/mtab/cnid_mtab.h | 11 ++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libatalk/cnid/mtab/cnid_mtab.c b/libatalk/cnid/mtab/cnid_mtab.c index 03a110f0..4cd14a05 100644 --- a/libatalk/cnid/mtab/cnid_mtab.c +++ b/libatalk/cnid/mtab/cnid_mtab.c @@ -1,6 +1,6 @@ /* - * $Id: cnid_mtab.c,v 1.2 2005-04-28 20:50:01 bfernhomberg Exp $ + * $Id: cnid_mtab.c,v 1.3 2009-11-24 08:59:25 franklahm Exp $ * * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu) * All Rights Reserved. See COPYRIGHT. @@ -31,7 +31,7 @@ /* ------------------------ */ cnid_t cnid_mtab_add(struct _cnid_db *cdb, const struct stat *st, - const cnid_t did, char *name, const int len, cnid_t hint) + const cnid_t did, char *name, const size_t len, cnid_t hint) { struct stat lst; const struct stat *lstp; @@ -59,13 +59,13 @@ int cnid_mtab_delete(struct _cnid_db *cdb, const cnid_t id) /* Return CNID for a given did/name. */ -cnid_t cnid_mtab_get(struct _cnid_db *cdb, const cnid_t did, char *name, const int len) +cnid_t cnid_mtab_get(struct _cnid_db *cdb, const cnid_t did, char *name, const size_t len) { return CNID_INVALID; } -cnid_t cnid_mtab_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const int len) +cnid_t cnid_mtab_lookup(struct _cnid_db *cdb, const struct stat *st, const cnid_t did, char *name, const size_t len) { return CNID_INVALID; } @@ -121,14 +121,14 @@ struct _cnid_module cnid_mtab_module = { /* Return the did/name pair corresponding to a CNID. */ -char *cnid_mtab_resolve(struct _cnid_db *cdb, cnid_t * id, void *buffer, u_int32_t len) +char *cnid_mtab_resolve(struct _cnid_db *cdb, cnid_t * id, void *buffer, size_t len) { return NULL; } int cnid_mtab_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st, - const cnid_t did, char *name, const int len + const cnid_t did, char *name, const size_t len /*, const char *info, const int infolen */ ) { return 0; diff --git a/libatalk/cnid/mtab/cnid_mtab.h b/libatalk/cnid/mtab/cnid_mtab.h index 28fe05cf..672e36ec 100644 --- a/libatalk/cnid/mtab/cnid_mtab.h +++ b/libatalk/cnid/mtab/cnid_mtab.h @@ -20,12 +20,13 @@ extern struct _cnid_module cnid_mtab_module; extern struct _cnid_db *cnid_mtab_open (const char *, mode_t); extern void cnid_mtab_close (struct _cnid_db *); extern cnid_t cnid_mtab_add (struct _cnid_db *, const struct stat *, const cnid_t, - char *, const int, cnid_t); -extern cnid_t cnid_mtab_get (struct _cnid_db *, const cnid_t, char *, const int); -extern char *cnid_mtab_resolve (struct _cnid_db *, cnid_t *, void *, u_int32_t); -extern cnid_t cnid_mtab_lookup (struct _cnid_db *, const struct stat *, const cnid_t, char *, const int); + char *, const size_t, cnid_t); +extern cnid_t cnid_mtab_get (struct _cnid_db *, const cnid_t, char *, const size_t); +extern char *cnid_mtab_resolve (struct _cnid_db *, cnid_t *, void *, size_t); +extern cnid_t cnid_mtab_lookup (struct _cnid_db *, const struct stat *, const cnid_t, + char *, const size_t); extern int cnid_mtab_update (struct _cnid_db *, const cnid_t, const struct stat *, - const cnid_t, char *, int); + const cnid_t, char *, size_t); extern int cnid_mtab_delete (struct _cnid_db *, const cnid_t); #endif /* include/atalk/cnid_mtab.h */ -- 2.39.2