sha1_io: inline functions
This commit is contained in:
parent
ee17b5e370
commit
569d0167d8
3 changed files with 15 additions and 40 deletions
6
Makefile
6
Makefile
|
|
@ -11,10 +11,10 @@ install : $(PROGRAMS)
|
|||
cp $^ $(HOME)/bin/
|
||||
|
||||
dlight : dlight.o buffer.o env.o http.o rss.o lockfile.o filter.o cconf.o \
|
||||
sha1_io.o proc-cache.o dlhist.o hash.o error.o
|
||||
proc-cache.o dlhist.o hash.o error.o
|
||||
dlight-compile : compile.o buffer.o env.o lockfile.o filter.o cconf.o \
|
||||
sha1_io.o error.o
|
||||
dlight-read-config : read-config.o buffer.o env.o cconf.o sha1_io.o error.o
|
||||
error.o
|
||||
dlight-read-config : read-config.o buffer.o env.o cconf.o error.o
|
||||
dlight-filter-check: filter-check.o filter.o error.o
|
||||
|
||||
dlight-% : %.o
|
||||
|
|
|
|||
35
sha1_io.c
35
sha1_io.c
|
|
@ -1,35 +0,0 @@
|
|||
/* sha1_io.c - sha1 file I/O wrappers.
|
||||
*
|
||||
* Copyright (C) 2011-2012 Henrik Hautakoski <henrik@fiktivkod.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
* MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <unistd.h>
|
||||
#include <arpa/inet.h>
|
||||
#include "sha1_io.h"
|
||||
|
||||
int sha1_write(SHA_CTX *ctx, int fd, void *buf, size_t size) {
|
||||
|
||||
SHA1_Update(ctx, buf, size);
|
||||
return write(fd, buf, size);
|
||||
}
|
||||
|
||||
int sha1_write_int(SHA_CTX *ctx, int fd, int val) {
|
||||
|
||||
val = htonl(val);
|
||||
return sha1_write(ctx, fd, &val, sizeof val);
|
||||
}
|
||||
14
sha1_io.h
14
sha1_io.h
|
|
@ -20,13 +20,23 @@
|
|||
#ifndef SHA1_IO_H
|
||||
#define SHA1_IO_H
|
||||
|
||||
#include <unistd.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <openssl/sha.h>
|
||||
|
||||
int sha1_write(SHA_CTX *ctx, int fd, void *buf, size_t size);
|
||||
inline int sha1_write(SHA_CTX *ctx, int fd, void *buf, size_t size) {
|
||||
|
||||
SHA1_Update(ctx, buf, size);
|
||||
return write(fd, buf, size);
|
||||
}
|
||||
|
||||
/* This function makes sure that the integer is in
|
||||
network byte order before it is written to disk
|
||||
by 'sha1_write'. */
|
||||
int sha1_write_int(SHA_CTX *ctx, int fd, int val);
|
||||
inline int sha1_write_int(SHA_CTX *ctx, int fd, int val) {
|
||||
|
||||
val = htonl(val);
|
||||
return sha1_write(ctx, fd, &val, sizeof val);
|
||||
}
|
||||
|
||||
#endif /* SHA1_IO_H */
|
||||
Reference in a new issue