mirror of
https://github.com/sheumann/hush.git
synced 2024-12-25 18:33:06 +00:00
just whitespace fixes
This commit is contained in:
parent
87848d91c7
commit
f885513940
@ -147,7 +147,7 @@ cleanup:
|
|||||||
* indirect blocks.
|
* indirect blocks.
|
||||||
*/
|
*/
|
||||||
#ifdef __TURBOC__
|
#ifdef __TURBOC__
|
||||||
#pragma argsused
|
# pragma argsused
|
||||||
#endif
|
#endif
|
||||||
static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
|
static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
|
||||||
e2_blkcnt_t blockcnt,
|
e2_blkcnt_t blockcnt,
|
||||||
|
@ -404,7 +404,7 @@ struct xlate {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#ifdef __TURBOC__
|
#ifdef __TURBOC__
|
||||||
#pragma argsused
|
# pragma argsused
|
||||||
#endif
|
#endif
|
||||||
static int xlate_func(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt,
|
static int xlate_func(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt,
|
||||||
blk_t ref_block EXT2FS_ATTR((unused)),
|
blk_t ref_block EXT2FS_ATTR((unused)),
|
||||||
|
@ -67,14 +67,14 @@ errcode_t ext2fs_sync_device(int fd, int flushb)
|
|||||||
return 0;
|
return 0;
|
||||||
#else
|
#else
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#warning BLKFLSBUF not defined
|
# warning BLKFLSBUF not defined
|
||||||
#endif /* __GNUC__ */
|
#endif /* __GNUC__ */
|
||||||
#endif
|
#endif
|
||||||
#ifdef FDFLUSH
|
#ifdef FDFLUSH
|
||||||
ioctl (fd, FDFLUSH, 0); /* In case this is a floppy */
|
ioctl (fd, FDFLUSH, 0); /* In case this is a floppy */
|
||||||
#else
|
#else
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#warning FDFLUSH not defined
|
# warning FDFLUSH not defined
|
||||||
#endif /* __GNUC__ */
|
#endif /* __GNUC__ */
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ struct get_pathname_struct {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#ifdef __TURBOC__
|
#ifdef __TURBOC__
|
||||||
#pragma argsused
|
# pragma argsused
|
||||||
#endif
|
#endif
|
||||||
static int get_pathname_proc(struct ext2_dir_entry *dirent,
|
static int get_pathname_proc(struct ext2_dir_entry *dirent,
|
||||||
int offset EXT2FS_ATTR((unused)),
|
int offset EXT2FS_ATTR((unused)),
|
||||||
|
@ -284,7 +284,7 @@ static int is_swap_device(const char *file)
|
|||||||
* characters.
|
* characters.
|
||||||
*/
|
*/
|
||||||
#ifdef __TURBOC__
|
#ifdef __TURBOC__
|
||||||
#pragma argsused
|
# pragma argsused
|
||||||
#endif
|
#endif
|
||||||
errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,
|
errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,
|
||||||
char *mtpt, int mtlen)
|
char *mtpt, int mtlen)
|
||||||
|
@ -92,7 +92,7 @@ static int link_proc(struct ext2_dir_entry *dirent,
|
|||||||
* entry filetype.
|
* entry filetype.
|
||||||
*/
|
*/
|
||||||
#ifdef __TURBOC__
|
#ifdef __TURBOC__
|
||||||
#pragma argsused
|
# pragma argsused
|
||||||
#endif
|
#endif
|
||||||
errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name,
|
errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name,
|
||||||
ext2_ino_t ino, int flags)
|
ext2_ino_t ino, int flags)
|
||||||
|
@ -26,7 +26,7 @@ struct lookup_struct {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#ifdef __TURBOC__
|
#ifdef __TURBOC__
|
||||||
#pragma argsused
|
# pragma argsused
|
||||||
#endif
|
#endif
|
||||||
static int lookup_proc(struct ext2_dir_entry *dirent,
|
static int lookup_proc(struct ext2_dir_entry *dirent,
|
||||||
int offset EXT2FS_ATTR((unused)),
|
int offset EXT2FS_ATTR((unused)),
|
||||||
|
@ -35,7 +35,7 @@ struct read_bb_record {
|
|||||||
* Helper function for ext2fs_read_bb_inode()
|
* Helper function for ext2fs_read_bb_inode()
|
||||||
*/
|
*/
|
||||||
#ifdef __TURBOC__
|
#ifdef __TURBOC__
|
||||||
#pragma argsused
|
# pragma argsused
|
||||||
#endif
|
#endif
|
||||||
static int mark_bad_block(ext2_filsys fs, blk_t *block_nr,
|
static int mark_bad_block(ext2_filsys fs, blk_t *block_nr,
|
||||||
e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
|
e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
|
||||||
|
@ -28,7 +28,7 @@ struct link_struct {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#ifdef __TURBOC__
|
#ifdef __TURBOC__
|
||||||
#pragma argsused
|
# pragma argsused
|
||||||
#endif
|
#endif
|
||||||
static int unlink_proc(struct ext2_dir_entry *dirent,
|
static int unlink_proc(struct ext2_dir_entry *dirent,
|
||||||
int offset EXT2FS_ATTR((unused)),
|
int offset EXT2FS_ATTR((unused)),
|
||||||
|
@ -44,28 +44,28 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef ATTRIBUTE_UNUSED
|
#ifndef ATTRIBUTE_UNUSED
|
||||||
#define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
|
# define ATTRIBUTE_UNUSED __attribute__ ((__unused__))
|
||||||
#endif /* ATTRIBUTE_UNUSED */
|
#endif /* ATTRIBUTE_UNUSED */
|
||||||
|
|
||||||
#ifndef ATTRIBUTE_NORETURN
|
#ifndef ATTRIBUTE_NORETURN
|
||||||
#define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
|
# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
|
||||||
#endif /* ATTRIBUTE_NORETURN */
|
#endif /* ATTRIBUTE_NORETURN */
|
||||||
|
|
||||||
#ifndef ATTRIBUTE_PACKED
|
#ifndef ATTRIBUTE_PACKED
|
||||||
#define ATTRIBUTE_PACKED __attribute__ ((__packed__))
|
# define ATTRIBUTE_PACKED __attribute__ ((__packed__))
|
||||||
#endif /* ATTRIBUTE_PACKED */
|
#endif /* ATTRIBUTE_PACKED */
|
||||||
|
|
||||||
#ifndef ATTRIBUTE_ALIGNED
|
#ifndef ATTRIBUTE_ALIGNED
|
||||||
#define ATTRIBUTE_ALIGNED(m) __attribute__ ((__aligned__(m)))
|
# define ATTRIBUTE_ALIGNED(m) __attribute__ ((__aligned__(m)))
|
||||||
#endif /* ATTRIBUTE_ALIGNED */
|
#endif /* ATTRIBUTE_ALIGNED */
|
||||||
|
|
||||||
/* -fwhole-program makes all symbols local. The attribute externally_visible
|
/* -fwhole-program makes all symbols local. The attribute externally_visible
|
||||||
forces a symbol global. */
|
forces a symbol global. */
|
||||||
#ifndef ATTRIBUTE_EXTERNALLY_VISIBLE
|
#ifndef ATTRIBUTE_EXTERNALLY_VISIBLE
|
||||||
# if __GNUC_PREREQ (4,1)
|
# if __GNUC_PREREQ (4,1)
|
||||||
# define ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((__externally_visible__))
|
# define ATTRIBUTE_EXTERNALLY_VISIBLE __attribute__ ((__externally_visible__))
|
||||||
# else
|
# else
|
||||||
# define ATTRIBUTE_EXTERNALLY_VISIBLE
|
# define ATTRIBUTE_EXTERNALLY_VISIBLE
|
||||||
# endif /* GNUC >= 4.1 */
|
# endif /* GNUC >= 4.1 */
|
||||||
#endif /* ATTRIBUTE_EXTERNALLY_VISIBLE */
|
#endif /* ATTRIBUTE_EXTERNALLY_VISIBLE */
|
||||||
|
|
||||||
@ -80,26 +80,26 @@
|
|||||||
|
|
||||||
/* ---- Endian Detection ------------------------------------ */
|
/* ---- Endian Detection ------------------------------------ */
|
||||||
#ifndef __APPLE__
|
#ifndef __APPLE__
|
||||||
#include <byteswap.h>
|
# include <byteswap.h>
|
||||||
#include <endian.h>
|
# include <endian.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __BIG_ENDIAN__
|
#ifdef __BIG_ENDIAN__
|
||||||
#define BB_BIG_ENDIAN 1
|
# define BB_BIG_ENDIAN 1
|
||||||
#define BB_LITTLE_ENDIAN 0
|
# define BB_LITTLE_ENDIAN 0
|
||||||
#elif __BYTE_ORDER == __BIG_ENDIAN
|
#elif __BYTE_ORDER == __BIG_ENDIAN
|
||||||
#define BB_BIG_ENDIAN 1
|
# define BB_BIG_ENDIAN 1
|
||||||
#define BB_LITTLE_ENDIAN 0
|
# define BB_LITTLE_ENDIAN 0
|
||||||
#else
|
#else
|
||||||
#define BB_BIG_ENDIAN 0
|
# define BB_BIG_ENDIAN 0
|
||||||
#define BB_LITTLE_ENDIAN 1
|
# define BB_LITTLE_ENDIAN 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ---- Networking ------------------------------------------ */
|
/* ---- Networking ------------------------------------------ */
|
||||||
#ifndef __APPLE__
|
#ifndef __APPLE__
|
||||||
#include <arpa/inet.h>
|
# include <arpa/inet.h>
|
||||||
#else
|
#else
|
||||||
#include <netinet/in.h>
|
# include <netinet/in.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* ---- miscellaneous --------------------------------------- */
|
/* ---- miscellaneous --------------------------------------- */
|
||||||
|
14
libbb/sha1.c
14
libbb/sha1.c
@ -147,13 +147,13 @@ void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx)
|
|||||||
void *sha1_end(void *resbuf, sha1_ctx_t *ctx)
|
void *sha1_end(void *resbuf, sha1_ctx_t *ctx)
|
||||||
{
|
{
|
||||||
/* SHA1 Final padding and digest calculation */
|
/* SHA1 Final padding and digest calculation */
|
||||||
#if BB_BIG_ENDIAN
|
#if BB_BIG_ENDIAN
|
||||||
static uint32_t mask[4] = { 0x00000000, 0xff000000, 0xffff0000, 0xffffff00 };
|
static uint32_t mask[4] = { 0x00000000, 0xff000000, 0xffff0000, 0xffffff00 };
|
||||||
static uint32_t bits[4] = { 0x80000000, 0x00800000, 0x00008000, 0x00000080 };
|
static uint32_t bits[4] = { 0x80000000, 0x00800000, 0x00008000, 0x00000080 };
|
||||||
#else
|
#else
|
||||||
static uint32_t mask[4] = { 0x00000000, 0x000000ff, 0x0000ffff, 0x00ffffff };
|
static uint32_t mask[4] = { 0x00000000, 0x000000ff, 0x0000ffff, 0x00ffffff };
|
||||||
static uint32_t bits[4] = { 0x00000080, 0x00008000, 0x00800000, 0x80000000 };
|
static uint32_t bits[4] = { 0x00000080, 0x00008000, 0x00800000, 0x80000000 };
|
||||||
#endif /* __BYTE_ORDER */
|
#endif /* __BYTE_ORDER */
|
||||||
|
|
||||||
uint8_t *hval = resbuf;
|
uint8_t *hval = resbuf;
|
||||||
uint32_t i, cnt = (uint32_t) (ctx->count[0] & SHA1_MASK);
|
uint32_t i, cnt = (uint32_t) (ctx->count[0] & SHA1_MASK);
|
||||||
|
Loading…
Reference in New Issue
Block a user