From 465b36e889811bf8b054bf6b8fea48599f9fba57 Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Thu, 5 Sep 2013 14:55:06 +0300
Subject: [PATCH] fixed some memset() errors and windoze build

---
 src/resfile.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/resfile.c b/src/resfile.c
index 367d868..2ef8327 100644
--- a/src/resfile.c
+++ b/src/resfile.c
@@ -71,8 +71,8 @@ static const char *getMyDir (void) {
 }
 
 
-#ifndef _WIN32
 void createHomeDir (void) {
+#ifndef _WIN32
   const char *h = getenv("HOME");
   char homeDir[1024];
   //
@@ -80,6 +80,7 @@ void createHomeDir (void) {
   mkdir(homeDir, 0755);
   sprintf(homeDir, "%s/.local/awish", h);
   mkdir(homeDir, 0755);
+#endif
 }
 
 
@@ -90,12 +91,11 @@ const char *getHomeDir (void) {
   if (!inited) {
 #ifndef _WIN32
     const char *h = getenv("HOME");
-    //
     sprintf(homeDir, "%s/.local/awish", (h && h[0] ? h : "."));
 #else
     // fuck windoze
     strcpy(homeDir, ".");
-    for (char *p = myDir; *p; ++p) if (*p == '\\') *p = '/';
+    for (char *p = homeDir; *p; ++p) if (*p == '\\') *p = '/';
 #endif
     inited = 1;
   }
@@ -105,13 +105,10 @@ const char *getHomeDir (void) {
 
 const char *getHomeDirFile (const char *fname) {
   static char homeDir[8192];
-  //
   sprintf(homeDir, "%s/%s", getHomeDir(), fname);
   //fprintf(stderr, "[%s]\n", homeDir);
-  //
   return homeDir;
 }
-#endif
 
 
 static uint32_t getUInt (const uint8_t *buf) {
@@ -132,7 +129,7 @@ static int tryInitResFile (ResFile *resfile, const char *fname) {
   //fprintf(stderr, "RES: [%s]\n", fname);
   if (!fl) return -1;
   if (!resfile) goto quit;
-  memset(resfile, 0, sizeof(resfile));
+  memset(resfile, 0, sizeof(*resfile));
   //
   if (fread(sign, 3, 1, fl) != 1) goto quit;
   if (memcmp(sign, "RES", 3) != 0 && memcmp(sign, "SND", 3) != 0 && memcmp(sign, "MUS", 3) != 0) goto quit;
@@ -162,7 +159,7 @@ quit:
     fclose(fl);
     if (resfile->sizes) free(resfile->sizes);
     if (resfile->offsets) free(resfile->offsets);
-    memset(resfile, 0, sizeof(resfile));
+    memset(resfile, 0, sizeof(*resfile));
     //fprintf(stderr, "RES: [%s]: FAIL\n", fname);
   }
   return rr;
@@ -210,7 +207,7 @@ void deinitResFile (ResFile *resfile) {
     if (resfile->fl) fclose(resfile->fl);
     if (resfile->sizes) free(resfile->sizes);
     if (resfile->offsets) free(resfile->offsets);
-    memset(resfile, 0, sizeof(resfile));
+    memset(resfile, 0, sizeof(*resfile));
   }
 }
 
-- 
2.11.4.GIT