diff options
| author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2007-08-29 16:01:26 +0300 |
|---|---|---|
| committer | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2007-08-29 17:34:18 +0300 |
| commit | e87f5a127d8606fa22957d0129e1c812db5ba3ce (patch) | |
| tree | d981dbfaac81ae168455188ea661af81b33354e8 /ubi-utils/src/bootenv.c | |
| parent | 8ef59d2c9ca8675bf9676c49847826427d9b6d26 (diff) | |
ubi-utils: do not interfer with system namespace
Rename __unused to ubi_unused to avoid clashes with system namespace
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'ubi-utils/src/bootenv.c')
| -rw-r--r-- | ubi-utils/src/bootenv.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ubi-utils/src/bootenv.c b/ubi-utils/src/bootenv.c index 561d473..a6dd4de 100644 --- a/ubi-utils/src/bootenv.c +++ b/ubi-utils/src/bootenv.c @@ -33,7 +33,7 @@ #include <mtd/ubi-header.h> #include "crc32.h" -#define __unused __attribute__((unused)) +#define ubi_unused __attribute__((unused)) #define BOOTENV_MAXLINE 512 /* max line size of a bootenv.txt file */ @@ -399,7 +399,7 @@ err: } static int -fill_output_buffer(bootenv_t env, char *buf, size_t buf_size_max __unused, +fill_output_buffer(bootenv_t env, char *buf, size_t buf_size_max ubi_unused, size_t *written) { int rc = 0; @@ -586,7 +586,7 @@ err: } int -bootenv_valid(bootenv_t env __unused) +bootenv_valid(bootenv_t env ubi_unused) { /* @FIXME No sanity check implemented. */ return 0; @@ -646,8 +646,8 @@ err: int bootenv_pdd_keep(bootenv_t env_old, bootenv_t env_new, bootenv_t *env_res, - int *warnings, char *err_buf __unused, - size_t err_buf_size __unused) + int *warnings, char *err_buf ubi_unused, + size_t err_buf_size ubi_unused) { bootenv_list_t l_old = NULL; bootenv_list_t l_new = NULL; @@ -756,8 +756,8 @@ err: int bootenv_pdd_overwrite(bootenv_t env_old, bootenv_t env_new, - bootenv_t *env_res, int *warnings __unused, - char *err_buf __unused, size_t err_buf_size __unused) + bootenv_t *env_res, int *warnings ubi_unused, + char *err_buf ubi_unused, size_t err_buf_size ubi_unused) { if ((env_old == NULL) || (env_new == NULL) || (env_res == NULL)) return -EINVAL; @@ -767,7 +767,7 @@ bootenv_pdd_overwrite(bootenv_t env_old, bootenv_t env_new, int bootenv_pdd_merge(bootenv_t env_old, bootenv_t env_new, bootenv_t *env_res, - int *warnings __unused, char *err_buf, size_t err_buf_size) + int *warnings ubi_unused, char *err_buf, size_t err_buf_size) { if ((env_old == NULL) || (env_new == NULL) || (env_res == NULL)) return -EINVAL; |