From 68a79430e621ee0fc19e9c36783f25586b1ca11e Mon Sep 17 00:00:00 2001
From: Renaud Fivet <Renaud.Fivet@gmail.com>
Date: Tue, 30 Apr 2013 17:24:46 +0800
Subject: [PATCH] cleanup usage and wrapper

---
 usage.c   | 29 +++++++++++++++++------------
 usage.h   |  2 +-
 wrapper.c | 33 ++++++++++++++++++++-------------
 wrapper.h |  6 ++++--
 4 files changed, 42 insertions(+), 28 deletions(-)
 mode change 100644 => 100755 wrapper.h

diff --git a/usage.c b/usage.c
index 0ae18ce..3edb798 100644
--- a/usage.c
+++ b/usage.c
@@ -1,22 +1,27 @@
+/* usage.c -- implements usage.h */
+
+/* TODO: align exit return code */
+
 #include "usage.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-static void report(const char* prefix, const char *err, va_list params)
-{
-	char msg[4096];
-	vsnprintf(msg, sizeof(msg), err, params);
-	fprintf(stderr, "%s%s\n", prefix, msg);
+static void report( const char *prefix, const char *err, va_list params) {
+	char msg[ 4096] ;
+
+	vsnprintf( msg, sizeof msg, err, params) ;
+	fprintf( stderr, "%s%s\n", prefix, msg) ;
 }
 
-void die(const char* err, ...)
-{
-	va_list params;
+void die( const char *err, ...) {
+	va_list params ;
 
-	va_start(params, err);
-	report("fatal: ", err, params);
-	va_end(params);
-	exit(128);
+	va_start( params, err) ;
+	report( "fatal: ", err, params) ;
+	va_end( params) ;
+	exit( 128) ;
 }
+
+/* end of usage.c */
diff --git a/usage.h b/usage.h
index bb6b40e..c57b48a 100644
--- a/usage.h
+++ b/usage.h
@@ -1,6 +1,6 @@
 #ifndef USAGE_H_
 #define USAGE_H_
 
-extern void die(const char* err, ...);
+void die( const char *err, ...) ;
 
 #endif  /* USAGE_H_ */
diff --git a/wrapper.c b/wrapper.c
index a3301e2..deedf08 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -1,22 +1,29 @@
+/* wrapper.c -- implements wrapper.h */
+
+#include "wrapper.h"
+
 #include "usage.h"
 
 #include <stdlib.h>
+#include <unistd.h>
 
 /* Function copyright: git */
-int xmkstemp(char *template)
-{
-	int fd;
+void xmkstemp( char *template) {
+	int fd ;
 
-	fd = mkstemp(template);
-	if (fd < 0)
-		die("Unable to create temporary file");
-	return fd;
+	fd = mkstemp( template) ;
+	if( fd < 0)
+		die( "Unable to create temporary file") ;
+
+	close( fd) ;
 }
 
-void *xmalloc(size_t size)
-{
-	void *ret = malloc(size);
-	if (!ret)
-		die("Out of memory");
-	return ret;
+void *xmalloc( size_t size) {
+	void *ret = malloc( size) ;
+	if( !ret)
+		die( "Out of memory") ;
+
+	return ret ;
 }
+
+/* end of wrapper.c */
diff --git a/wrapper.h b/wrapper.h
old mode 100644
new mode 100755
index 25f5bc0..1f81c10
--- a/wrapper.h
+++ b/wrapper.h
@@ -1,8 +1,10 @@
 #ifndef WRAPPER_H_
 #define WRAPPER_H_
 
-extern int xmkstemp(char *template);
+#include <stdlib.h>
 
-extern void *xmalloc(size_t size);
+void xmkstemp( char *template) ;
+
+void *xmalloc( size_t size) ;
 
 #endif  /* WRAPPER_H_ */