OSDN Git Service

util.h: whitespace cleanup
authorPeter Jones <pjones@redhat.com>
Thu, 19 Apr 2018 14:25:16 +0000 (10:25 -0400)
committerPeter Jones <pmjones@gmail.com>
Mon, 21 May 2018 13:27:22 +0000 (09:27 -0400)
Signed-off-by: Peter Jones <pjones@redhat.com>
src/util.h

index ed60104..75b6d21 100644 (file)
 #endif
 #endif
 #ifndef int_add
-#define int_add(a, b, c) ({                                    \
-               const int _limit = INT_MAX;                     \
-               int _ret;                                       \
-               _ret = _limit - ((unsigned long long)a) >       \
-                         ((unsigned long long)b);              \
-               if (!_ret)                                      \
-                       *(c) = ((a) + (b));                     \
-               _ret;                                           \
-       })
+#define int_add(a, b, c) ({                                             \
+                const int _limit = INT_MAX;                             \
+                int _ret;                                               \
+                _ret = _limit - ((unsigned long long)a) >               \
+                          ((unsigned long long)b);                      \
+                if (!_ret)                                              \
+                        *(c) = ((a) + (b));                             \
+                _ret;                                                   \
+        })
 #endif
 #ifndef long_add
-#define long_add(a, b, c) ({                                   \
-               const long _limit = LONG_MAX;                   \
-               int _ret;                                       \
-               _ret = _limit - ((unsigned long long)a) >       \
-                          ((unsigned long long)b);             \
-               if (!_ret)                                      \
-                       *(c) = ((a) + (b));                     \
-               _ret;                                           \
-       })
+#define long_add(a, b, c) ({                                            \
+                const long _limit = LONG_MAX;                           \
+                int _ret;                                               \
+                _ret = _limit - ((unsigned long long)a) >               \
+                           ((unsigned long long)b);                     \
+                if (!_ret)                                              \
+                        *(c) = ((a) + (b));                             \
+                _ret;                                                   \
+        })
 #endif
 #ifndef long_mult
-#define long_mult(a, b, c) ({                                  \
-               const long _limit = LONG_MAX;                   \
-               int _ret = 1;                                   \
-               if ((a) == 0 || (b) == 0)                       \
-                       _ret = 0;                               \
-               else                                            \
-                       _ret = _limit / (a) < (b);              \
-               if (!_ret)                                      \
-                       *(c) = ((a) * (b));                     \
-               _ret;                                           \
-       })
+#define long_mult(a, b, c) ({                                           \
+                const long _limit = LONG_MAX;                           \
+                int _ret = 1;                                           \
+                if ((a) == 0 || (b) == 0)                               \
+                        _ret = 0;                                       \
+                else                                                    \
+                        _ret = _limit / (a) < (b);                      \
+                if (!_ret)                                              \
+                        *(c) = ((a) * (b));                             \
+                _ret;                                                   \
+        })
 #endif
 #ifndef ulong_add
-#define ulong_add(a, b, c) ({                                  \
-               const unsigned long _limit = ULONG_MAX;         \
-               int _ret;                                       \
-               _ret = _limit - ((unsigned long long)a) >       \
-                           ((unsigned long long)b);            \
-               if (!_ret)                                      \
-                       *(c) = ((a) + (b));                     \
-               _ret;                                           \
-       })
+#define ulong_add(a, b, c) ({                                           \
+                const unsigned long _limit = ULONG_MAX;                 \
+                int _ret;                                               \
+                _ret = _limit - ((unsigned long long)a) >               \
+                            ((unsigned long long)b);                    \
+                if (!_ret)                                              \
+                        *(c) = ((a) + (b));                             \
+                _ret;                                                   \
+        })
 #endif
 #ifndef ulong_mult
-#define ulong_mult(a, b, c) ({                                 \
-               const unsigned long _limit = ULONG_MAX;         \
-               int _ret = 1;                                   \
-               if ((a) == 0 || (b) == 0)                       \
-                       _ret = 0;                               \
-               else                                            \
-                       _ret = _limit / (a) < (b);              \
-               if (!_ret)                                      \
-                       *(c) = ((a) * (b));                     \
-               _ret;                                           \
-       })
+#define ulong_mult(a, b, c) ({                                          \
+                const unsigned long _limit = ULONG_MAX;                 \
+                int _ret = 1;                                           \
+                if ((a) == 0 || (b) == 0)                               \
+                        _ret = 0;                                       \
+                else                                                    \
+                        _ret = _limit / (a) < (b);                      \
+                if (!_ret)                                              \
+                        *(c) = ((a) * (b));                             \
+                _ret;                                                   \
+        })
 #endif
 
 #if defined(__GNUC__) && defined(__GNUC_MINOR__)
 #if __GNUC__ >= 5 && __GNUC_MINOR__ >= 1
-#define add(a, b, c) _Generic((c),                                     \
-                             int *: int_add(a,b,c),                    \
-                             long *: long_add(a,b,c),                  \
-                             unsigned long *: ulong_add(a,b,c))
-#define mult(a, b, c) _Generic((c),                                    \
-                             long *: long_mult(a,b,c),                 \
-                             unsigned long *: ulong_mult(a,b,c))
+#define add(a, b, c) _Generic((c),                                      \
+                              int *: int_add(a,b,c),                    \
+                              long *: long_add(a,b,c),                  \
+                              unsigned long *: ulong_add(a,b,c))
+#define mult(a, b, c) _Generic((c),                                     \
+                              long *: long_mult(a,b,c),                 \
+                              unsigned long *: ulong_mult(a,b,c))
 #endif
 #endif
 
 #ifndef add
-#define add(a, b, c) ({                                                \
-               (*(c)) = ((a) + (b));                           \
-               })
+#define add(a, b, c) ({                                                 \
+                (*(c)) = ((a) + (b));                                   \
+                })
 #endif
 #ifndef mult
-#define mult(a, b, c) ({                                       \
-               (*(c)) = ((a) * (b));                           \
-               })
+#define mult(a, b, c) ({                                                \
+                (*(c)) = ((a) * (b));                                   \
+                })
 #endif
 
 
@@ -136,89 +136,89 @@ static inline int
 __attribute__((unused))
 read_file(int fd, uint8_t **buf, size_t *bufsize)
 {
-       uint8_t *p;
-       size_t size = 4096;
-       size_t filesize = 0;
-       ssize_t s = 0;
+        uint8_t *p;
+        size_t size = 4096;
+        size_t filesize = 0;
+        ssize_t s = 0;
 
-       uint8_t *newbuf;
-       if (!(newbuf = calloc(size, sizeof (uint8_t))))
-               return -1;
-       *buf = newbuf;
+        uint8_t *newbuf;
+        if (!(newbuf = calloc(size, sizeof (uint8_t))))
+                return -1;
+        *buf = newbuf;
 
-       do {
-               p = *buf + filesize;
-               /* size - filesize shouldn't exceed SSIZE_MAX because we're
-                * only allocating 4096 bytes at a time and we're checking that
-                * before doing so. */
-               s = read(fd, p, size - filesize);
-               if (s < 0 && errno == EAGAIN) {
-                       /*
-                        * if we got EAGAIN, there's a good chance we've hit
-                        * the kernel rate limiter.  Doing more reads is just
-                        * going to make it worse, so instead, give it a rest.
-                        */
-                       sched_yield();
-                       continue;
-               } else if (s < 0) {
-                       int saved_errno = errno;
-                       free(*buf);
-                       *buf = NULL;
-                       *bufsize = 0;
-                       errno = saved_errno;
-                       return -1;
-               }
-               filesize += s;
-               /* only exit for empty reads */
-               if (s == 0)
-                       break;
-               if (filesize >= size) {
-                       /* See if we're going to overrun and return an error
-                        * instead. */
-                       if (size > (size_t)-1 - 4096) {
-                               free(*buf);
-                               *buf = NULL;
-                               *bufsize = 0;
-                               errno = ENOMEM;
-                               return -1;
-                       }
-                       newbuf = realloc(*buf, size + 4096);
-                       if (newbuf == NULL) {
-                               int saved_errno = errno;
-                               free(*buf);
-                               *buf = NULL;
-                               *bufsize = 0;
-                               errno = saved_errno;
-                               return -1;
-                       }
-                       *buf = newbuf;
-                       memset(*buf + size, '\0', 4096);
-                       size += 4096;
-               }
-       } while (1);
+        do {
+                p = *buf + filesize;
+                /* size - filesize shouldn't exceed SSIZE_MAX because we're
+                 * only allocating 4096 bytes at a time and we're checking that
+                 * before doing so. */
+                s = read(fd, p, size - filesize);
+                if (s < 0 && errno == EAGAIN) {
+                        /*
+                         * if we got EAGAIN, there's a good chance we've hit
+                         * the kernel rate limiter.  Doing more reads is just
+                         * going to make it worse, so instead, give it a rest.
+                         */
+                        sched_yield();
+                        continue;
+                } else if (s < 0) {
+                        int saved_errno = errno;
+                        free(*buf);
+                        *buf = NULL;
+                        *bufsize = 0;
+                        errno = saved_errno;
+                        return -1;
+                }
+                filesize += s;
+                /* only exit for empty reads */
+                if (s == 0)
+                        break;
+                if (filesize >= size) {
+                        /* See if we're going to overrun and return an error
+                         * instead. */
+                        if (size > (size_t)-1 - 4096) {
+                                free(*buf);
+                                *buf = NULL;
+                                *bufsize = 0;
+                                errno = ENOMEM;
+                                return -1;
+                        }
+                        newbuf = realloc(*buf, size + 4096);
+                        if (newbuf == NULL) {
+                                int saved_errno = errno;
+                                free(*buf);
+                                *buf = NULL;
+                                *bufsize = 0;
+                                errno = saved_errno;
+                                return -1;
+                        }
+                        *buf = newbuf;
+                        memset(*buf + size, '\0', 4096);
+                        size += 4096;
+                }
+        } while (1);
 
-       newbuf = realloc(*buf, filesize+1);
-       if (!newbuf) {
-               free(*buf);
-               *buf = NULL;
-               return -1;
-       }
-       newbuf[filesize] = '\0';
-       *buf = newbuf;
-       *bufsize = filesize+1;
-       return 0;
+        newbuf = realloc(*buf, filesize+1);
+        if (!newbuf) {
+                free(*buf);
+                *buf = NULL;
+                return -1;
+        }
+        newbuf[filesize] = '\0';
+        *buf = newbuf;
+        *bufsize = filesize+1;
+        return 0;
 }
 
 static inline uint64_t
 __attribute__((unused))
 lcm(uint64_t x, uint64_t y)
 {
-       uint64_t m = x, n = y, o;
-       while ((o = m % n)) {
-               m = n;
-               n = o;
-       }
-       return (x / n) * y;
+        uint64_t m = x, n = y, o;
+        while ((o = m % n)) {
+                m = n;
+                n = o;
+        }
+        return (x / n) * y;
 }
 
 /************************************************************
@@ -233,113 +233,113 @@ static inline int
 __attribute__((unused))
 get_sector_size(int filedes)
 {
-       int rc, sector_size = 512;
+        int rc, sector_size = 512;
 
-       rc = ioctl(filedes, BLKSSZGET, &sector_size);
-       if (rc)
-               sector_size = 512;
-       return sector_size;
+        rc = ioctl(filedes, BLKSSZGET, &sector_size);
+        if (rc)
+                sector_size = 512;
+        return sector_size;
 }
 
 #ifndef strndupa
-#define strndupa(s, l)                                                 \
-       (__extension__ ({                                               \
-               const char *__in = (s);                                 \
-                size_t __len = strnlen (__in, (l));                    \
-                char *__out = (char *) alloca (__len + 1);             \
-                strncpy(__out, __in, __len);                           \
-                __out[__len] = '\0';                                   \
-                __out;                                                 \
-       }))
+#define strndupa(s, l)                                                  \
+       (__extension__ ({                                                \
+                const char *__in = (s);                                 \
+                size_t __len = strnlen (__in, (l));                     \
+                char *__out = (char *) alloca (__len + 1);              \
+                strncpy(__out, __in, __len);                            \
+                __out[__len] = '\0';                                    \
+                __out;                                                  \
+        }))
 #endif
 
-#define asprintfa(str, fmt, args...)                                   \
-       ({                                                              \
-               char *_tmp = NULL;                                      \
-               int _rc;                                                \
-               *(str) = NULL;                                          \
-               _rc = asprintf((str), (fmt), ## args);                  \
-               if (_rc > 0) {                                          \
-                       _tmp = strdupa(*(str));                         \
-                       if (!_tmp) {                                    \
-                               _rc = -1;                               \
-                       } else {                                        \
-                               free(*(str));                           \
-                               *(str) = _tmp;                          \
-                       }                                               \
-               } else {                                                \
-                       _rc = -1;                                       \
-               }                                                       \
-               _rc;                                                    \
-       })
+#define asprintfa(str, fmt, args...)                                    \
+        ({                                                              \
+                char *_tmp = NULL;                                      \
+                int _rc;                                                \
+                *(str) = NULL;                                          \
+                _rc = asprintf((str), (fmt), ## args);                  \
+                if (_rc > 0) {                                          \
+                        _tmp = strdupa(*(str));                         \
+                        if (!_tmp) {                                    \
+                                _rc = -1;                               \
+                        } else {                                        \
+                                free(*(str));                           \
+                                *(str) = _tmp;                          \
+                        }                                               \
+                } else {                                                \
+                        _rc = -1;                                       \
+                }                                                       \
+                _rc;                                                    \
+        })
 
-#define read_sysfs_file(buf, fmt, args...)                             \
-       ({                                                              \
-               int _rc=-1;                                             \
-               char *_pathname;                                        \
-               uint8_t *_buf=NULL;                                     \
-               size_t _bufsize=-1;                                     \
-               int _saved_errno;                                       \
-                                                                       \
-               *(buf) = NULL;                                          \
-               _rc = asprintfa(&_pathname, (fmt), ## args);            \
-               if (_rc >= 0) {                                         \
-                       int _fd;                                        \
-                       _fd = open(_pathname, O_RDONLY);                \
-                       _saved_errno = errno;                           \
-                       _rc = -1;                                       \
-                       if (_fd >= 0) {                                 \
-                               _rc = read_file(_fd, &_buf, &_bufsize); \
-                               _saved_errno = errno;                   \
-                               close(_fd);                             \
-                               errno = _saved_errno;                   \
-                       }                                               \
-               }                                                       \
-               if (_rc >= 0) {                                         \
-                       uint8_t *_buf2 = alloca(_bufsize);              \
-                       _saved_errno = errno;                           \
-                       if (_buf2) {                                    \
-                               memcpy(_buf2, _buf, _bufsize);          \
-                               _rc = _bufsize;                         \
-                       }                                               \
-                       free(_buf);                                     \
-                       *((uint8_t **)buf) = _buf2;                     \
-                       errno = _saved_errno;                           \
-               }                                                       \
-               _rc;                                                    \
-       })
+#define read_sysfs_file(buf, fmt, args...)                              \
+        ({                                                              \
+                int _rc=-1;                                             \
+                char *_pathname;                                        \
+                uint8_t *_buf=NULL;                                     \
+                size_t _bufsize=-1;                                     \
+                int _saved_errno;                                       \
+                                                                        \
+                *(buf) = NULL;                                          \
+                _rc = asprintfa(&_pathname, (fmt), ## args);            \
+                if (_rc >= 0) {                                         \
+                        int _fd;                                        \
+                        _fd = open(_pathname, O_RDONLY);                \
+                        _saved_errno = errno;                           \
+                        _rc = -1;                                       \
+                        if (_fd >= 0) {                                 \
+                                _rc = read_file(_fd, &_buf, &_bufsize); \
+                                _saved_errno = errno;                   \
+                                close(_fd);                             \
+                                errno = _saved_errno;                   \
+                        }                                               \
+                }                                                       \
+                if (_rc >= 0) {                                         \
+                        uint8_t *_buf2 = alloca(_bufsize);              \
+                        _saved_errno = errno;                           \
+                        if (_buf2) {                                    \
+                                memcpy(_buf2, _buf, _bufsize);          \
+                                _rc = _bufsize;                         \
+                        }                                               \
+                        free(_buf);                                     \
+                        *((uint8_t **)buf) = _buf2;                     \
+                        errno = _saved_errno;                           \
+                }                                                       \
+                _rc;                                                    \
+        })
 
-#define sysfs_readlink(linkbuf, fmt, args...)                          \
-       ({                                                              \
-               char *_lb = alloca(PATH_MAX+1);                         \
-               char *_pn;                                              \
-               int _rc;                                                \
-                                                                       \
-               *(linkbuf) = NULL;                                      \
-               _rc = asprintfa(&_pn, fmt, ## args);                    \
-               if (_rc >= 0) {                                         \
-                       ssize_t _linksz;                                \
-                       _linksz = readlink(_pn, _lb, PATH_MAX);         \
-                       _rc = _linksz;                                  \
-                       if (_linksz >= 0)                               \
-                               _lb[_linksz] = '\0';                    \
-                       *(linkbuf) = _lb;                               \
-               }                                                       \
-               _rc;                                                    \
-       })
+#define sysfs_readlink(linkbuf, fmt, args...)                           \
+        ({                                                              \
+                char *_lb = alloca(PATH_MAX+1);                         \
+                char *_pn;                                              \
+                int _rc;                                                \
+                                                                        \
+                *(linkbuf) = NULL;                                      \
+                _rc = asprintfa(&_pn, fmt, ## args);                    \
+                if (_rc >= 0) {                                         \
+                        ssize_t _linksz;                                \
+                        _linksz = readlink(_pn, _lb, PATH_MAX);         \
+                        _rc = _linksz;                                  \
+                        if (_linksz >= 0)                               \
+                                _lb[_linksz] = '\0';                    \
+                        *(linkbuf) = _lb;                               \
+                }                                                       \
+                _rc;                                                    \
+        })
 
 static inline void
 __attribute__((unused))
 swizzle_guid_to_uuid(efi_guid_t *guid)
 {
-       uint32_t *u32;
-       uint16_t *u16;
+        uint32_t *u32;
+        uint16_t *u16;
 
-       u32 = (uint32_t *)guid;
-       u32[0] = __builtin_bswap32(u32[0]);
-       u16 = (uint16_t *)&u32[1];
-       u16[0] = __builtin_bswap16(u16[0]);
-       u16[1] = __builtin_bswap16(u16[1]);
+        u32 = (uint32_t *)guid;
+        u32[0] = __builtin_bswap32(u32[0]);
+        u16 = (uint16_t *)&u32[1];
+        u16[0] = __builtin_bswap16(u16[0]);
+        u16[1] = __builtin_bswap16(u16[1]);
 }
 
 #endif /* EFIVAR_UTIL_H */