diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-09 07:54:20 -0700 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-10-09 07:54:21 -0700 |
| commit | 80dfc87394ed10f47918299a5192f337a85333d8 (patch) | |
| tree | 04ef12fcbb6e2a8a375a229288ac3ac48186397e /util | |
| parent | 576e81be39ee195b9fd7c948fed16ed6846cef3a (diff) | |
| parent | 387eedebf60a463ba30833588f10123da296ba4d (diff) | |
| download | qemu-80dfc87394ed10f47918299a5192f337a85333d8.zip qemu-80dfc87394ed10f47918299a5192f337a85333d8.tar.gz qemu-80dfc87394ed10f47918299a5192f337a85333d8.tar.bz2 | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Stefan Weil (5) and others
# Via Michael Tokarev
* mjt/trivial-patches:
migration: Fix compiler warning ('caps' may be used uninitialized)
util/path: Fix type which is longer than 8 bit for MinGW
hw/9pfs: Fix errno value for xattr functions
vl: Clean up unnecessary boot_order complications
qemu-char: Fix potential out of bounds access to local arrays
pci-ohci: Add missing 'break' in ohci_service_td
sh4: Fix serial line access for Linux kernels later than 3.2
hw/alpha: Fix compiler warning (integer constant is too large)
target-i386: Fix compiler warning (integer constant is too large)
block: Remove unused assignment (fixes warning from clang)
exec: cleanup DEBUG_SUBPAGE
tests: Fix schema parser test for in-tree build
tests: Update .gitignore for test-int128 and test-bitops
.gitignore: ignore tests/qemu-iotests/socket_scm_helper
Message-id: 1381051979-25742-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'util')
| -rw-r--r-- | util/path.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/path.c b/util/path.c index f0c6962..623219e 100644 --- a/util/path.c +++ b/util/path.c @@ -39,7 +39,7 @@ static int strneq(const char *s1, unsigned int n, const char *s2) } static struct pathelem *add_entry(struct pathelem *root, const char *name, - unsigned char type); + unsigned type); static struct pathelem *new_entry(const char *root, struct pathelem *parent, @@ -82,7 +82,7 @@ static struct pathelem *add_dir_maybe(struct pathelem *path) } static struct pathelem *add_entry(struct pathelem *root, const char *name, - unsigned char type) + unsigned type) { struct pathelem **e; |