From 569d0167d81ccc9988a366a73901b1aa0d643d23 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@fiktivkod.org>
Date: Wed, 22 Aug 2012 11:57:33 +0200
Subject: [PATCH] sha1_io: inline functions

---
 Makefile  |  6 +++---
 sha1_io.c | 35 -----------------------------------
 sha1_io.h | 14 ++++++++++++--
 3 files changed, 15 insertions(+), 40 deletions(-)
 delete mode 100644 sha1_io.c

diff --git a/Makefile b/Makefile
index df743d9..fd64383 100644
--- a/Makefile
+++ b/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
diff --git a/sha1_io.c b/sha1_io.c
deleted file mode 100644
index 8cd2ca0..0000000
--- a/sha1_io.c
+++ /dev/null
@@ -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);
-}
diff --git a/sha1_io.h b/sha1_io.h
index 7da05af..f35add1 100644
--- a/sha1_io.h
+++ b/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 */
\ No newline at end of file