Update license headers

[xonotic/gmqcc.git] / msvc.c

diff --git a/msvc.c b/msvc.c
index 3f447970b07e20388f6b353782a3d43b6741d8d1..cb13cc2dcce74d4f81a173ea219952dc4a558aed 100644 (file)
--- a/msvc.c
+++ b/msvc.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
@@ -20,6 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+#define GMQCC_PLATFORM_HEADER
 #include <string.h>
 #include <stdlib.h>
 
@@ -51,21 +52,18 @@ static void *platform_mem_allocate(size_t bytes) {
 }
 
 int platform_vsnprintf(char *buffer, size_t bytes, const char *format, va_list arg) {
-    vsnprintf_s(buffer, bytes, bytes, format, arg);
+    return vsnprintf_s(buffer, bytes, bytes, format, arg);
 }
 
-int platform_sscanf(const char *str, const char *format, ...) {
-    va_list va;
-    va_start(va, format);
-    vsscanf_s(str, format, va);
-    va_end(va);
+int platform_vsscanf(const char *str, const char *format, va_list va) {
+    return vsscanf_s(str, format, va);
 }
 
 const struct tm *platform_localtime(const time_t *timer) {
     struct tm *t;
     t = (struct tm*)platform_mem_allocate(sizeof(struct tm));
     localtime_s(&t, timer);
-    return &t;
+    return t;
 }
 
 const char *platform_ctime(const time_t *timer) {
@@ -78,28 +76,13 @@ char *platform_strncat(char *dest, const char *src, size_t num) {
     return strncat_s(dest, num, src, _TRUNCATE);
 }
 
-const char *platform_tmpnam(char *str) {
-    return tmpnam_s(str, L_tmpnam);
-}
-
-const char *platform_getenv(char *var) {
+const char *platform_getenv(const char *var) {
     char  *buffer = (char *)platform_mem_allocate(GETENV_BUFFER);
     size_t size;
     getenv_s(&size, buffer, GETENV_BUFFER, var);
     return buffer;
 }
 
-int platform_snprintf(char *src, size_t bytes, const char *format, ...) {
-    int      rt;
-    va_list  va;
-    va_start(va, format);
-
-    rt = vsprintf_s(src, bytes, format, va);
-    va_end  (va);
-
-    return rt;
-}
-
 /*
  * TODO: this isn't exactly 'accurate' for MSVC but it seems to work,
  * at least to some extent.
@@ -244,5 +227,5 @@ struct dirent *platform_readdir(DIR *dir) {
 }
 
 int platform_istty(int fd) {
-    return _istty(fd);
+    return _isatty(fd);
 }