diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-03-12 11:25:13 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-03-12 11:53:03 +0000 |
| commit | 3d279d15c192779a290892e1789fa74360f002ff (patch) | |
| tree | cb949ec48028ba135c0338234d40dcb15da6d37e /src | |
| parent | b8cdf6c2b9d12df6acbe295fd75c8c59c8b7eec1 (diff) | |
| download | libguestfs-3d279d15c192779a290892e1789fa74360f002ff.tar.gz libguestfs-3d279d15c192779a290892e1789fa74360f002ff.tar.xz libguestfs-3d279d15c192779a290892e1789fa74360f002ff.zip | |
inspect: Use uint64_t for maximum file size in bytes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/guestfs-internal.h | 2 | ||||
| -rw-r--r-- | src/inspect.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h index c679ada4..ff17a223 100644 --- a/src/guestfs-internal.h +++ b/src/guestfs-internal.h @@ -411,7 +411,7 @@ extern void guestfs___call_callbacks_message (guestfs_h *g, uint64_t event, cons extern void guestfs___call_callbacks_array (guestfs_h *g, uint64_t event, const uint64_t *array, size_t array_len); extern int guestfs___is_file_nocase (guestfs_h *g, const char *); extern int guestfs___is_dir_nocase (guestfs_h *g, const char *); -extern char *guestfs___download_to_tmp (guestfs_h *g, struct inspect_fs *fs, const char *filename, const char *basename, int64_t max_size); +extern char *guestfs___download_to_tmp (guestfs_h *g, struct inspect_fs *fs, const char *filename, const char *basename, uint64_t max_size); extern char *guestfs___case_sensitive_path_silently (guestfs_h *g, const char *); extern struct inspect_fs *guestfs___search_for_root (guestfs_h *g, const char *root); diff --git a/src/inspect.c b/src/inspect.c index 4a4871f4..9672aff8 100644 --- a/src/inspect.c +++ b/src/inspect.c @@ -734,7 +734,7 @@ guestfs___feature_available (guestfs_h *g, const char *feature) char * guestfs___download_to_tmp (guestfs_h *g, struct inspect_fs *fs, const char *filename, - const char *basename, int64_t max_size) + const char *basename, uint64_t max_size) { char *r; int fd; @@ -756,7 +756,7 @@ guestfs___download_to_tmp (guestfs_h *g, struct inspect_fs *fs, if (size == -1) /* guestfs_filesize failed and has already set error in handle */ goto error; - if (size > max_size) { + if ((uint64_t) size > max_size) { error (g, _("size of %s is unreasonably large (%" PRIi64 " bytes)"), filename, size); goto error; |