mirror of
https://github.com/sheumann/hush.git
synced 2024-08-20 04:28:57 +00:00
whitespace fixes
This commit is contained in:
parent
cf26ab70c1
commit
2570b2e575
@ -13,14 +13,14 @@
|
|||||||
#define RPM_HEADER_MAGIC "\216\255\350"
|
#define RPM_HEADER_MAGIC "\216\255\350"
|
||||||
|
|
||||||
struct rpm_lead {
|
struct rpm_lead {
|
||||||
unsigned char magic[4];
|
unsigned char magic[4];
|
||||||
uint8_t major, minor;
|
uint8_t major, minor;
|
||||||
uint16_t type;
|
uint16_t type;
|
||||||
uint16_t archnum;
|
uint16_t archnum;
|
||||||
char name[66];
|
char name[66];
|
||||||
uint16_t osnum;
|
uint16_t osnum;
|
||||||
uint16_t signature_type;
|
uint16_t signature_type;
|
||||||
char reserved[16];
|
char reserved[16];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct rpm_header {
|
struct rpm_header {
|
||||||
|
30
libbb/md5.c
30
libbb/md5.c
@ -206,15 +206,13 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
|
|||||||
before the computation. To reduce the work for the next steps
|
before the computation. To reduce the work for the next steps
|
||||||
we store the swapped words in the array CORRECT_WORDS. */
|
we store the swapped words in the array CORRECT_WORDS. */
|
||||||
|
|
||||||
# define OP(a, b, c, d, s, T) \
|
# define OP(a, b, c, d, s, T) \
|
||||||
do \
|
do { \
|
||||||
{ \
|
a += FF (b, c, d) + (*cwp++ = SWAP_LE32(*words)) + T; \
|
||||||
a += FF (b, c, d) + (*cwp++ = SWAP_LE32(*words)) + T; \
|
++words; \
|
||||||
++words; \
|
CYCLIC (a, s); \
|
||||||
CYCLIC (a, s); \
|
a += b; \
|
||||||
a += b; \
|
} while (0)
|
||||||
} \
|
|
||||||
while (0)
|
|
||||||
|
|
||||||
/* It is unfortunate that C does not provide an operator for
|
/* It is unfortunate that C does not provide an operator for
|
||||||
cyclic rotation. Hope the C compiler is smart enough. */
|
cyclic rotation. Hope the C compiler is smart enough. */
|
||||||
@ -265,14 +263,12 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
|
|||||||
in CORRECT_WORDS. Redefine the macro to take an additional first
|
in CORRECT_WORDS. Redefine the macro to take an additional first
|
||||||
argument specifying the function to use. */
|
argument specifying the function to use. */
|
||||||
# undef OP
|
# undef OP
|
||||||
# define OP(f, a, b, c, d, k, s, T) \
|
# define OP(f, a, b, c, d, k, s, T) \
|
||||||
do \
|
do { \
|
||||||
{ \
|
a += f (b, c, d) + correct_words[k] + T; \
|
||||||
a += f (b, c, d) + correct_words[k] + T; \
|
CYCLIC (a, s); \
|
||||||
CYCLIC (a, s); \
|
a += b; \
|
||||||
a += b; \
|
} while (0)
|
||||||
} \
|
|
||||||
while (0)
|
|
||||||
|
|
||||||
/* Round 2. */
|
/* Round 2. */
|
||||||
# if MD5_SIZE_VS_SPEED == 1
|
# if MD5_SIZE_VS_SPEED == 1
|
||||||
|
@ -93,17 +93,17 @@
|
|||||||
/* Never change this otherwise the binary interface will change */
|
/* Never change this otherwise the binary interface will change */
|
||||||
|
|
||||||
struct devfsd_notify_struct
|
struct devfsd_notify_struct
|
||||||
{ /* Use native C types to ensure same types in kernel and user space */
|
{ /* Use native C types to ensure same types in kernel and user space */
|
||||||
unsigned int type; /* DEVFSD_NOTIFY_* value */
|
unsigned int type; /* DEVFSD_NOTIFY_* value */
|
||||||
unsigned int mode; /* Mode of the inode or device entry */
|
unsigned int mode; /* Mode of the inode or device entry */
|
||||||
unsigned int major; /* Major number of device entry */
|
unsigned int major; /* Major number of device entry */
|
||||||
unsigned int minor; /* Minor number of device entry */
|
unsigned int minor; /* Minor number of device entry */
|
||||||
unsigned int uid; /* Uid of process, inode or device entry */
|
unsigned int uid; /* Uid of process, inode or device entry */
|
||||||
unsigned int gid; /* Gid of process, inode or device entry */
|
unsigned int gid; /* Gid of process, inode or device entry */
|
||||||
unsigned int overrun_count; /* Number of lost events */
|
unsigned int overrun_count; /* Number of lost events */
|
||||||
unsigned int namelen; /* Number of characters not including '\0' */
|
unsigned int namelen; /* Number of characters not including '\0' */
|
||||||
/* The device name MUST come last */
|
/* The device name MUST come last */
|
||||||
char devname[DEVFS_PATHLEN]; /* This will be '\0' terminated */
|
char devname[DEVFS_PATHLEN]; /* This will be '\0' terminated */
|
||||||
};
|
};
|
||||||
|
|
||||||
#define BUFFER_SIZE 16384
|
#define BUFFER_SIZE 16384
|
||||||
|
@ -129,7 +129,7 @@ struct globals {
|
|||||||
#define master (G.master )
|
#define master (G.master )
|
||||||
#define slave (G.slave )
|
#define slave (G.slave )
|
||||||
#define INIT_G() do { \
|
#define INIT_G() do { \
|
||||||
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
|
SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
|
||||||
|
@ -39,35 +39,35 @@ static int ip_do(int (*ip_func)(char **argv), char **argv)
|
|||||||
int ipaddr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
int ipaddr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||||
int ipaddr_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
int ipaddr_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||||
{
|
{
|
||||||
return ip_do(do_ipaddr, argv);
|
return ip_do(do_ipaddr, argv);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if ENABLE_FEATURE_IP_LINK
|
#if ENABLE_FEATURE_IP_LINK
|
||||||
int iplink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
int iplink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||||
int iplink_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
int iplink_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||||
{
|
{
|
||||||
return ip_do(do_iplink, argv);
|
return ip_do(do_iplink, argv);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if ENABLE_FEATURE_IP_ROUTE
|
#if ENABLE_FEATURE_IP_ROUTE
|
||||||
int iproute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
int iproute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||||
int iproute_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
int iproute_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||||
{
|
{
|
||||||
return ip_do(do_iproute, argv);
|
return ip_do(do_iproute, argv);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if ENABLE_FEATURE_IP_RULE
|
#if ENABLE_FEATURE_IP_RULE
|
||||||
int iprule_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
int iprule_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||||
int iprule_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
int iprule_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||||
{
|
{
|
||||||
return ip_do(do_iprule, argv);
|
return ip_do(do_iprule, argv);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if ENABLE_FEATURE_IP_TUNNEL
|
#if ENABLE_FEATURE_IP_TUNNEL
|
||||||
int iptunnel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
int iptunnel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||||
int iptunnel_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
int iptunnel_main(int argc ATTRIBUTE_UNUSED, char **argv)
|
||||||
{
|
{
|
||||||
return ip_do(do_iptunnel, argv);
|
return ip_do(do_iptunnel, argv);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -158,10 +158,10 @@ static int generate_output(char **argv, int argc, const char *optstr, const stru
|
|||||||
|
|
||||||
/* Reset getopt(3) (see libbb/getopt32.c for long rant) */
|
/* Reset getopt(3) (see libbb/getopt32.c for long rant) */
|
||||||
#ifdef __GLIBC__
|
#ifdef __GLIBC__
|
||||||
optind = 0;
|
optind = 0;
|
||||||
#else /* BSD style */
|
#else /* BSD style */
|
||||||
optind = 1;
|
optind = 1;
|
||||||
/* optreset = 1; */
|
/* optreset = 1; */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
|
@ -160,7 +160,7 @@ int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off)
|
|||||||
|
|
||||||
buf = volume_id_get_buffer(id, off + HFS_SUPERBLOCK_OFFSET, 0x200);
|
buf = volume_id_get_buffer(id, off + HFS_SUPERBLOCK_OFFSET, 0x200);
|
||||||
if (buf == NULL)
|
if (buf == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
hfs = (struct hfs_mdb *) buf;
|
hfs = (struct hfs_mdb *) buf;
|
||||||
if (hfs->signature[0] != 'B' || hfs->signature[1] != 'D')
|
if (hfs->signature[0] != 'B' || hfs->signature[1] != 'D')
|
||||||
|
Loading…
Reference in New Issue
Block a user