diff options
| author | Brian Behlendorf <[email protected]> | 2010-08-26 09:52:39 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2010-08-27 15:28:32 -0700 |
| commit | d6320ddb78fa89c4d0fc2af00ae53c7c70992f96 (patch) | |
| tree | 8a50c251b955ae31a670835ac0c90cfba6d28752 /lib | |
| parent | c5b3a7bbcc321846bb15ff73c6fd6f1c483b6aa6 (diff) | |
Fix gcc c90 compliance warnings
Fix non-c90 compliant code, for the most part these changes
simply deal with where a particular variable is declared.
Under c90 it must alway be done at the very start of a block.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libuutil/uu_misc.c | 4 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_import.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/libuutil/uu_misc.c b/lib/libuutil/uu_misc.c index 3d5b40ca8..66a6ca569 100644 --- a/lib/libuutil/uu_misc.c +++ b/lib/libuutil/uu_misc.c @@ -209,7 +209,11 @@ uu_panic(const char *format, ...) int assfail(const char *astring, const char *file, int line) { +#if defined(__STDC__) && __STDC_VERSION__ - 0 >= 199901L + __assert_c99(astring, file, line, "unknown func"); +#else __assert(astring, file, line); +#endif /*NOTREACHED*/ return (0); } diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c index e1370350f..6e1524e67 100644 --- a/lib/libzfs/libzfs_import.c +++ b/lib/libzfs/libzfs_import.c @@ -410,7 +410,9 @@ refresh_config(libzfs_handle_t *hdl, nvlist_t *config) boolean_t vdev_is_hole(uint64_t *hole_array, uint_t holes, uint_t id) { - for (int c = 0; c < holes; c++) { + int c; + + for (c = 0; c < holes; c++) { /* Top-level is a hole */ if (hole_array[c] == id) |