Major cleanup of platform/fs stuff

[xonotic/gmqcc.git] / gmqcc.h

diff --git a/gmqcc.h b/gmqcc.h
index 7834a24fd59216b580d2a92c3ff8e78e105cb4e0..235059debecdebb9c00262a54eeeadc405bd80f1 100644 (file)
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012, 2013, 2014
+ * Copyright (C) 2012, 2013, 2014, 2015
  *     Dale Weiler
  *     Wolfgang Bumiller
  *
@@ -25,6 +25,8 @@
 #define GMQCC_HDR
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdlib.h>
+#include <stdio.h>
 #include <time.h>
 
 #define GMQCC_VERSION_MAJOR 0
@@ -178,20 +180,15 @@ GMQCC_IND_STRING(GMQCC_VERSION_PATCH) \
 #define GMQCC_ARRAY_COUNT(X) (sizeof(X) / sizeof((X)[0]))
 
 /* stat.c */
-void  stat_info          (void);
-char *stat_mem_strdup    (const char *, size_t,         const char *, bool);
-void  stat_mem_deallocate(void *,       size_t,         const char *);
-void *stat_mem_reallocate(void *,       size_t, size_t, const char *, const char *);
-void *stat_mem_allocate  (size_t, size_t, const char *, const char *);
+char *stat_mem_strdup(const char *, bool);
 
-#define mem_a(SIZE)              stat_mem_allocate  ((SIZE), __LINE__, __FILE__, #SIZE)
-#define mem_d(PTRN)              stat_mem_deallocate((void*)(PTRN), __LINE__, __FILE__)
-#define mem_r(PTRN, SIZE)        stat_mem_reallocate((void*)(PTRN), (SIZE), __LINE__, __FILE__, #SIZE)
-#define mem_af(SIZE, FILE, LINE) stat_mem_allocate  ((SIZE), (LINE), (FILE), #SIZE)
+#define mem_a(SIZE)              malloc(SIZE)
+#define mem_d(PTRN)              free((void*)PTRN)
+#define mem_r(PTRN, SIZE)        realloc((void*)PTRN, SIZE)
 
 /* TODO: rename to mem variations */
-#define util_strdup(SRC)         stat_mem_strdup((char*)(SRC), __LINE__, __FILE__, false)
-#define util_strdupe(SRC)        stat_mem_strdup((char*)(SRC), __LINE__, __FILE__, true)
+#define util_strdup(SRC)         stat_mem_strdup((char*)(SRC), false)
+#define util_strdupe(SRC)        stat_mem_strdup((char*)(SRC), true)
 
 /* util.c */
 
@@ -237,9 +234,7 @@ const char *util_strerror(int err);
 const struct tm *util_localtime(const time_t *timer);
 const char      *util_ctime    (const time_t *timer);
 
-typedef struct fs_file_s fs_file_t;
-
-bool             util_isatty(fs_file_t *);
+bool             util_isatty(FILE *);
 size_t           hash(const char *key);
 
 /*
@@ -260,14 +255,14 @@ typedef struct {
 void _util_vec_grow(void **a, size_t i, size_t s);
 void _util_vec_delete(void *vec, size_t line, const char *file);
 
-#define GMQCC_VEC_WILLGROW(X,Y) ( \
+#define GMQCC_VEC_WILLGROW(X, Y) ( \
     ((!(X) || vec_meta(X)->used + Y >= vec_meta(X)->allocated)) ? \
         (void)_util_vec_grow(((void**)&(X)), (Y), sizeof(*(X))) : \
         (void)0                                                   \
 )
 
 /* exposed interface */
-#define vec_meta(A)       ((vector_t*)(((char *)(A)) - (sizeof(vector_t) + 4)))
+#define vec_meta(A)       ((vector_t*)(((char *)(A)) - sizeof(vector_t)))
 #define vec_free(A)       ((void)((A) ? (_util_vec_delete((void *)(A), __LINE__, __FILE__), (A) = NULL) : 0))
 #define vec_push(A,V)     (GMQCC_VEC_WILLGROW((A),1), (A)[vec_meta(A)->used++] = (V))
 #define vec_size(A)       ((A) ? vec_meta(A)->used : 0)
@@ -330,55 +325,7 @@ int           util_snprintf(char *str, size_t, const char *fmt, ...);
 
 
 /* fs.c */
-#define FS_FILE_SEEK_SET  0
-#define FS_FILE_SEEK_CUR  1
-#define FS_FILE_SEEK_END  2
-#define FS_FILE_EOF      -1
-
-typedef struct fs_dir_s  fs_dir_t;
-/*typedef struct fs_file_s fs_file_t;*/
-typedef struct dirent    fs_dirent_t;
-
-void           fs_file_close  (fs_file_t *);
-int            fs_file_error  (fs_file_t *);
-int            fs_file_getc   (fs_file_t *);
-int            fs_file_printf (fs_file_t *, const char *, ...);
-int            fs_file_puts   (fs_file_t *, const char *);
-int            fs_file_seek   (fs_file_t *, long int, int);
-long           fs_file_tell   (fs_file_t *);
-int            fs_file_flush  (fs_file_t *);
-
-size_t         fs_file_read   (void *,        size_t, size_t, fs_file_t *);
-size_t         fs_file_write  (const void *,  size_t, size_t, fs_file_t *);
-
-fs_file_t     *fs_file_open   (const char *, const char *);
-int            fs_file_getline(char  **, size_t *, fs_file_t *);
-
-int            fs_dir_make    (const char *);
-fs_dir_t      *fs_dir_open    (const char *);
-int            fs_dir_close   (fs_dir_t *);
-fs_dirent_t   *fs_dir_read    (fs_dir_t *);
-
-
-/* correct.c */
-typedef struct correct_trie_s {
-    void                  *value;
-    struct correct_trie_s *entries;
-} correct_trie_t;
-
-correct_trie_t* correct_trie_new(void);
-
-typedef struct {
-    char   ***edits;
-    size_t  **lens;
-} correction_t;
-
-void  correct_del (correct_trie_t*, size_t **);
-void  correct_add (correct_trie_t*, size_t ***, const char *);
-char *correct_str (correction_t *, correct_trie_t*, const char *);
-void  correct_init(correction_t *);
-void  correct_free(correction_t *);
-
+int fs_file_getline(char  **, size_t *, FILE *);
 
 /* code.c */
 
@@ -701,8 +648,8 @@ enum {
     LVL_ERROR
 };
 
-fs_file_t *con_default_out(void);
-fs_file_t *con_default_err(void);
+FILE *con_default_out(void);
+FILE *con_default_err(void);
 
 void con_vprintmsg (int level, const char *name, size_t line, size_t column, const char *msgtype, const char *msg, va_list ap);
 void con_printmsg  (int level, const char *name, size_t line, size_t column, const char *msgtype, const char *msg, ...);
@@ -713,7 +660,6 @@ void con_close (void);
 void con_init  (void);
 void con_reset (void);
 void con_color (int);
-int  con_change(const char *, const char *);
 int  con_verr  (const char *, va_list);
 int  con_vout  (const char *, va_list);
 int  con_err   (const char *, ...);
@@ -987,7 +933,7 @@ typedef struct {
 
 extern opts_cmd_t opts;
 
-#define OPTS_GENERIC(f,i)    (!! (((f)[(i)/32]) & (1<< (unsigned)((i)%32))))
+#define OPTS_GENERIC(f,i)    (!! (((f)[(i)/32]) & (1U << (unsigned)((i)%32))))
 
 #define OPTS_FLAG(i)         OPTS_GENERIC(opts.flags,        (i))
 #define OPTS_WARN(i)         OPTS_GENERIC(opts.warn,         (i))