diff options
| author | Chih-hung Hsieh <chh@google.com> | 2016-06-22 21:21:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-22 21:21:16 +0000 |
| commit | 786c536e84ef29b9c885f15bf8cf9b92653962ec (patch) | |
| tree | bd67194e8c01490ad327d5f9844a7699f9a4c778 | |
| parent | 0c0f9228cf1cd0f39ecb56f643ce7e3b050bb143 (diff) | |
| parent | aae793802b77cbd18cf93637ee16b36b1734c525 (diff) | |
| download | vold-nougat-mr1-wear-release.tar.gz | |
Merge "Fix misc-macro-parentheses warnings in system/vold."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
| -rw-r--r-- | VolumeManager.h | 2 | ||||
| -rw-r--r-- | cryptfs.h | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/VolumeManager.h b/VolumeManager.h index 39fc8f95..dd9f09df 100644 --- a/VolumeManager.h +++ b/VolumeManager.h @@ -217,7 +217,7 @@ private: extern "C" { #endif /* __cplusplus */ -#define UNMOUNT_NOT_MOUNTED_ERR -2 +#define UNMOUNT_NOT_MOUNTED_ERR (-2) int vold_unmountAll(void); #ifdef __cplusplus } @@ -178,32 +178,32 @@ struct crypt_persist_data { /* Return values for cryptfs_crypto_complete */ #define CRYPTO_COMPLETE_NOT_ENCRYPTED 1 #define CRYPTO_COMPLETE_ENCRYPTED 0 -#define CRYPTO_COMPLETE_BAD_METADATA -1 -#define CRYPTO_COMPLETE_PARTIAL -2 -#define CRYPTO_COMPLETE_INCONSISTENT -3 -#define CRYPTO_COMPLETE_CORRUPT -4 +#define CRYPTO_COMPLETE_BAD_METADATA (-1) +#define CRYPTO_COMPLETE_PARTIAL (-2) +#define CRYPTO_COMPLETE_INCONSISTENT (-3) +#define CRYPTO_COMPLETE_CORRUPT (-4) /* Return values for cryptfs_enable_inplace*() */ #define ENABLE_INPLACE_OK 0 -#define ENABLE_INPLACE_ERR_OTHER -1 -#define ENABLE_INPLACE_ERR_DEV -2 /* crypto_blkdev issue */ +#define ENABLE_INPLACE_ERR_OTHER (-1) +#define ENABLE_INPLACE_ERR_DEV (-2) /* crypto_blkdev issue */ /* Return values for cryptfs_getfield */ #define CRYPTO_GETFIELD_OK 0 -#define CRYPTO_GETFIELD_ERROR_NO_FIELD -1 -#define CRYPTO_GETFIELD_ERROR_OTHER -2 -#define CRYPTO_GETFIELD_ERROR_BUF_TOO_SMALL -3 +#define CRYPTO_GETFIELD_ERROR_NO_FIELD (-1) +#define CRYPTO_GETFIELD_ERROR_OTHER (-2) +#define CRYPTO_GETFIELD_ERROR_BUF_TOO_SMALL (-3) /* Return values for cryptfs_setfield */ #define CRYPTO_SETFIELD_OK 0 -#define CRYPTO_SETFIELD_ERROR_OTHER -1 -#define CRYPTO_SETFIELD_ERROR_FIELD_TOO_LONG -2 -#define CRYPTO_SETFIELD_ERROR_VALUE_TOO_LONG -3 +#define CRYPTO_SETFIELD_ERROR_OTHER (-1) +#define CRYPTO_SETFIELD_ERROR_FIELD_TOO_LONG (-2) +#define CRYPTO_SETFIELD_ERROR_VALUE_TOO_LONG (-3) /* Return values for persist_del_key */ #define PERSIST_DEL_KEY_OK 0 -#define PERSIST_DEL_KEY_ERROR_OTHER -1 -#define PERSIST_DEL_KEY_ERROR_NO_FIELD -2 +#define PERSIST_DEL_KEY_ERROR_OTHER (-1) +#define PERSIST_DEL_KEY_ERROR_NO_FIELD (-2) #ifdef __cplusplus extern "C" { |