summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backend.h2
-rw-r--r--netfs.c6
-rw-r--r--tar.c1
-rw-r--r--tarfs.c2
-rw-r--r--zipstores.c2
5 files changed, 7 insertions, 6 deletions
diff --git a/backend.h b/backend.h
index ca7d649df..91fd25069 100644
--- a/backend.h
+++ b/backend.h
@@ -58,7 +58,7 @@ struct fs_backend
void (* get_argp)(struct argp *s);
/* Get arguments (see netfs_append_args()). */
- error_t (*get_args)(char **argz, unsigned *argz_len);
+ error_t (*get_args)(char **argz, size_t *argz_len);
/* Set options (see netfs_set_options()). */
error_t (*set_options)(const char *argz, size_t argz_len);
diff --git a/netfs.c b/netfs.c
index eb57c3dde..190b7c0d1 100644
--- a/netfs.c
+++ b/netfs.c
@@ -440,7 +440,7 @@ netfs_attempt_syncfs (struct iouser *cred, int wait)
CRED. NP is locked. */
error_t
netfs_set_translator (struct iouser *cred, struct node *np,
- const char *argz, size_t argzlen)
+ const char *argz, mach_msg_type_number_t argzlen)
{
return EOPNOTSUPP;
}
@@ -452,7 +452,7 @@ netfs_set_translator (struct iouser *cred, struct node *np,
*ARGZ_LEN to the total length. */
error_t
netfs_get_translator (struct node *node, char **argz,
- size_t *argz_len)
+ mach_msg_type_number_t *argz_len)
{
*argz_len = 0;
*argz = (char*)malloc (sizeof (char));
@@ -778,7 +778,7 @@ netfs_attempt_create_file (struct iouser *user, struct node *dir,
list of the arguments to this translator. The default definition of this
routine simply calls netfs_append_std_options. */
error_t
-netfs_append_args (char **argz, unsigned *argz_len)
+netfs_append_args (char **argz, size_t *argz_len)
{
error_t err = 0;
diff --git a/tar.c b/tar.c
index db9401a90..db1d8e23b 100644
--- a/tar.c
+++ b/tar.c
@@ -22,6 +22,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <stdarg.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/tarfs.c b/tarfs.c
index 459f9d64f..f2da52b8c 100644
--- a/tarfs.c
+++ b/tarfs.c
@@ -231,7 +231,7 @@ tarfs_get_argp (struct argp *a)
/* Append to the malloced string *ARGZ of len *ARGZ_LEN a NULL-separated list
of arguments. */
error_t
-tarfs_get_args (char **argz, unsigned *argz_len)
+tarfs_get_args (char **argz, size_t *argz_len)
{
error_t err = 0;
diff --git a/zipstores.c b/zipstores.c
index ca8beaa3b..2e5861d6a 100644
--- a/zipstores.c
+++ b/zipstores.c
@@ -191,7 +191,7 @@ store_simple_write (struct store *store, off_t addr, void *buf,
err = store_set_size (store, newsize);
if (err)
{
- error (0, err, "Unable to set store size to %u", newsize);
+ error (0, err, "Unable to set store size to %zu", newsize);
return err;
}
}