1 files changed, 18 insertions, 69 deletions

diff --git a/wrapper/rvs.h b/wrapper/rvs.h
index 57358f2..bdd5c68 100644
--- a/wrapper/rvs.h
+++ b/wrapper/rvs.h
@@ -1,5 +1,5 @@
-/* wrapper/rvs.h -- rvs program header, contains most system-dependand code,
-     and general-purose functions.
+/* wrapper/rvs.h -- general and machine specific functions for rvs.
+   system depends:<stdio.h> <stdlib.h> <string.h> <unistd.h> <errno.h> <error.h>
    Copyright (C) 2009 Luke Shumaker
    
    This file is part of rvs.
@@ -37,91 +37,40 @@ extern char *program_invocation_short_name;
 /*extern int EXIT_SUCCESS;*/
 /*extern int EXIT_FAILURE;*/
 
+extern
 void *
-xmalloc (size_t size)
-{
-	void *value = malloc (size);
-	if (value == NULL) {
-		perror(program_invocation_name);
-		exit(EXIT_FAILURE);
-	}
-	return value;
-}
+xmalloc (size_t size);
 
+extern
 void *
-xrealloc (void *ptr, size_t size)
-{
-	void *value = realloc (ptr, size);
-	if (value == NULL) {
-		perror(program_invocation_name);
-		exit(EXIT_FAILURE);
-	}
-	return value;
-}
+xrealloc (void *ptr, size_t size);
 
+extern
 void
-xfree (void *ptr)
-{
-	if (ptr!=NULL)
-		free (ptr);
-}
+xfree (void *ptr);
 
+extern
 void
-xsystem (const char *command)
-{
-	int stat=system(command);
-	if (stat!=0) {
-		if (stat==-1) {
-			fprintf(stderr,
-				"%s: unable to launch run command",
-				program_invocation_name);
-			exit(EXIT_FAILURE);
-		} else
-			exit(EXIT_FAILURE);
-	}
-}
+xsystem (const char *command);
 
 /* unistd.h */
+extern
 int
-xchdir (const char *filename)
-{
-	int ret=chdir(filename);
-	if (ret != 0)
-		error(EXIT_FAILURE,errno,"%s/",filename);
-	return ret;
-}
+xchdir (const char *filename);
 
 /* stdio.h */
+extern
 FILE *
-xfopen (const char *filename, const char *opentype)
-{
-	FILE *file = fopen(filename,opentype);
-	/* fopen gives NULL on failure */
-	if ( file == NULL )
-		error(EXIT_FAILURE,errno,"%s",filename);
-	return file;
-}
+xfopen (const char *filename, const char *opentype);
 
 /* string funtions */
+extern
 void
-stradds(size_t *size, char **dest, char *str)
-{
-	if (*size > ( strlen(*dest) + strlen(str) ))
-		strcat(*dest, str);
-	else {
-		*size = strlen(*dest) + strlen(str) + 1;
-		*dest = (char *) xrealloc (*dest, *size);
-		strcat(*dest, str);
-	}
-}
+stradds(size_t *size, char **dest, char *str);
 
+extern
 char *
-stralloc (const char *string)
-{
-	char *copy = (char *)xmalloc(strlen(string)+1);
-	strcpy(copy,string);
-	return copy;
-}
+stralloc (const char *string);
 
 #endif