Browse Source

more KNF

OPENBSD_3_6
millert 20 years ago
parent
commit
1e36196ad9
1 changed files with 15 additions and 15 deletions
  1. +15
    -15
      src/lib/libc/hash/helper.c

+ 15
- 15
src/lib/libc/hash/helper.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: helper.c,v 1.2 2004/04/29 02:39:32 millert Exp $ */
/* $OpenBSD: helper.c,v 1.3 2004/04/29 02:43:06 millert Exp $ */
/* /*
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
@ -10,7 +10,7 @@
*/ */
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
static const char rcsid[] = "$OpenBSD: helper.c,v 1.2 2004/04/29 02:39:32 millert Exp $";
static const char rcsid[] = "$OpenBSD: helper.c,v 1.3 2004/04/29 02:43:06 millert Exp $";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include <sys/types.h> #include <sys/types.h>
@ -35,7 +35,7 @@ HASHEnd(HASH_CTX *ctx, char buf[HASH_DIGEST_STRING_LENGTH])
if (buf == NULL && (buf = malloc(HASH_DIGEST_STRING_LENGTH)) == NULL) if (buf == NULL && (buf = malloc(HASH_DIGEST_STRING_LENGTH)) == NULL)
return(NULL); return(NULL);
HASHFinal(digest,ctx);
HASHFinal(digest, ctx);
for (i = 0; i < HASH_DIGEST_LENGTH; i++) { for (i = 0; i < HASH_DIGEST_LENGTH; i++) {
buf[i + i] = hex[digest[i] >> 4]; buf[i + i] = hex[digest[i] >> 4];
buf[i + i + 1] = hex[digest[i] & 0x0f]; buf[i + i + 1] = hex[digest[i] & 0x0f];
@ -48,22 +48,22 @@ HASHEnd(HASH_CTX *ctx, char buf[HASH_DIGEST_STRING_LENGTH])
char * char *
HASHFile(char *filename, char buf[HASH_DIGEST_STRING_LENGTH]) HASHFile(char *filename, char buf[HASH_DIGEST_STRING_LENGTH])
{ {
u_char buffer[BUFSIZ];
HASH_CTX ctx;
int fd, num, save_errno;
u_char buffer[BUFSIZ];
HASH_CTX ctx;
int fd, num, save_errno;
HASHInit(&ctx);
HASHInit(&ctx);
if ((fd = open(filename, O_RDONLY)) < 0)
return(NULL);
if ((fd = open(filename, O_RDONLY)) < 0)
return(NULL);
while ((num = read(fd, buffer, sizeof(buffer))) > 0)
HASHUpdate(&ctx, buffer, num);
while ((num = read(fd, buffer, sizeof(buffer))) > 0)
HASHUpdate(&ctx, buffer, num);
save_errno = errno;
close(fd);
errno = save_errno;
return (num < 0 ? NULL : HASHEnd(&ctx, buf));
save_errno = errno;
close(fd);
errno = save_errno;
return (num < 0 ? NULL : HASHEnd(&ctx, buf));
} }
char * char *


Loading…
Cancel
Save