coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-11 05:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

nvmutil: macro safety

Browse Source 
maximum safety.

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2026-05-26 21:41:02 +01:00
parent bc4bc4b67e
commit 049ee793db
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/nvmutil/nvmutil.c
+32 -14
View File
@@ -77,26 +77,41 @@ op_t op[] = {
}; };
void (*cmd)(void) = NULL; void (*cmd)(void) = NULL;
#define err_if(x) if (x) err(EXIT_FAILURE, "%s", filename) #define err_if(x) \
do { \
if (x) { \
err(EXIT_FAILURE, "%s", filename); \
} \
} while(0)
#define xopen(f,l,p) \ #define xopen(f,l,p) \
do { \ do { \
if ((f = open_on_eintr(l, p)) == -1) \ if ((f = open_on_eintr(l, p)) == -1) { \
err(EXIT_FAILURE, "%s", l); \ err(EXIT_FAILURE, "%s", l); \
if (fstat(f, &st) == -1) \ } \
err(EXIT_FAILURE, "%s", l); \ if (fstat(f, &st) == -1) { \
err(EXIT_FAILURE, "%s", l); \
} \
} while(0) } while(0)
#define word(pos16, partnum) ((uint16_t *) gbe[partnum])[pos16] #define word(pos16, partnum) \
#define setWord(pos16, p, val16) if (word(pos16, p) != val16) \ (((uint16_t *) gbe[partnum])[pos16])
nvmPartChanged[p] = 1 | (word(pos16, p) = val16)
#define SUCCESS(x) ((x) >= 0) #define setWord(pos16, p, val16) \
do { \
if (word(pos16, p) != val16) { \
nvmPartChanged[p] = 1 | (word(pos16, p) = val16); \
} \
} while(0)
#define SUCCESS(x) \
((x) >= 0)
#define reset_caller_errno(return_value) \ #define reset_caller_errno(return_value) \
do { \ do { \
if (SUCCESS(return_value) && (!errno)) \ if (SUCCESS(return_value) && (!errno)) { \
errno = saved_errno; \ errno = saved_errno; \
} \
} while (0) } while (0)
int int
@@ -726,21 +741,24 @@ if_err_sys(int condition)
#define fs_err_retry() \ #define fs_err_retry() \
do { \ do { \
if ((rval == -1) && \ if ((rval == -1) && \
(errno == EINTR)) \ (errno == EINTR)) { \
return 1; \ return 1; \
if (rval >= 0 && !errno) \ } \
if (rval >= 0 && !errno) { \
errno = saved_errno; \ errno = saved_errno; \
return 0; \ } \
} while(0) } while(0)
int int
fs_retry(int saved_errno, int rval) fs_retry(int saved_errno, int rval)
{ {
fs_err_retry(); fs_err_retry();
return 0;
} }
int int
rw_retry(int saved_errno, ssize_t rval) rw_retry(int saved_errno, ssize_t rval)
{ {
fs_err_retry(); fs_err_retry();
return 0;
} }