Major cleanup of platform/fs stuff

[xonotic/gmqcc.git] / fs.c

diff --git a/fs.c b/fs.c
index beb48192f85d3f36cb3fc64677452a6608e3b21b..4c7a178739e02d9a2c7e5c0f1563d9044853eb04 100644 (file)
--- a/fs.c
+++ b/fs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013
+ * Copyright (C) 2012, 2013, 2014, 2015
  *     Dale Weiler
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -21,63 +21,7 @@
  * SOFTWARE.
  */
 #include "gmqcc.h"
-#include "platform.h"
 
-FILE *fs_file_open(const char *filename, const char *mode) {
-    return platform_fopen(filename, mode);
-}
-
-size_t fs_file_read(void *buffer, size_t size, size_t count, FILE *fp) {
-    return platform_fread(buffer, size, count, fp);
-}
-
-int fs_file_printf(FILE *fp, const char *format, ...) {
-    int      rt;
-    va_list  va;
-    va_start(va, format);
-    rt = platform_vfprintf(fp, format, va);
-    va_end  (va);
-
-    return rt;
-}
-
-void fs_file_close(FILE *fp) {
-    platform_fclose (fp);
-}
-
-size_t  fs_file_write (
-    const void    *buffer,
-    size_t         size,
-    size_t         count,
-    FILE          *fp
-) {
-    return platform_fwrite(buffer, size, count, fp);
-}
-
-int fs_file_error(FILE *fp) {
-    return platform_ferror(fp);
-}
-
-int fs_file_getc(FILE *fp) {
-    return platform_fgetc(fp);
-}
-
-int fs_file_puts(FILE *fp, const char *str) {
-    return platform_fputs(str, fp);
-}
-
-int fs_file_seek(FILE *fp, long int off, int whence) {
-    return platform_fseek(fp, off, whence);
-}
-
-long int fs_file_tell(FILE *fp) {
-    return platform_ftell(fp);
-}
-
-/*
- * Implements libc getline for systems that don't have it, which is
- * assmed all.  This works the same as getline().
- */
 int fs_file_getline(char **lineptr, size_t *n, FILE *stream) {
     int   chr;
     int   ret;
@@ -94,7 +38,7 @@ int fs_file_getline(char **lineptr, size_t *n, FILE *stream) {
     pos = *lineptr;
 
     for (;;) {
-        int c = fs_file_getc(stream);
+        int c = getc(stream);
 
         if (chr < 2) {
             *n += (*n > 16) ? *n : 64;
@@ -121,19 +65,3 @@ int fs_file_getline(char **lineptr, size_t *n, FILE *stream) {
     *pos = '\0';
     return (ret = pos - *lineptr);
 }
-
-int fs_dir_make(const char *path) {
-    return platform_mkdir(path, 0700);
-}
-
-DIR *fs_dir_open(const char *name) {
-    return platform_opendir(name);
-}
-
-int fs_dir_close(DIR *dir) {
-    return platform_closedir(dir);
-}
-
-struct dirent *fs_dir_read(DIR *dir) {
-    return platform_readdir(dir);
-}