[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55043] trunk/blender/source/blender: code cleanup: remove unused member of direntry struct, also add include for building on osx.

[Campbell Barton]

Revision: 55043
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55043
Author:   campbellbarton
Date:     2013-03-05 06:38:43 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
code cleanup: remove unused member of direntry struct, also add include for building on osx.

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_fileops_types.h
    trunk/blender/source/blender/blenlib/intern/storage.c
    trunk/blender/source/blender/quicktime/apple/qtkit_import.m

Modified: trunk/blender/source/blender/blenlib/BLI_fileops_types.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_fileops_types.h	2013-03-05 06:26:10 UTC (rev 55042)
+++ trunk/blender/source/blender/blenlib/BLI_fileops_types.h	2013-03-05 06:38:43 UTC (rev 55043)
@@ -42,7 +42,6 @@
 struct ImBuf;
 
 struct direntry {
-	char   *string;
 	mode_t  type;
 	char   *relname;
 	char   *path;

Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c	2013-03-05 06:26:10 UTC (rev 55042)
+++ trunk/blender/source/blender/blenlib/intern/storage.c	2013-03-05 06:38:43 UTC (rev 55043)
@@ -434,9 +434,6 @@
 		BLI_snprintf(buf, sizeof(buf), "%s %s %s %7s %s %s %10s %s",
 		             file->mode1, file->mode2, file->mode3, file->owner,
 		             file->date, file->time, size, file->relname);
-
-		file->string = BLI_strdup(buf);
-		/* FIXME: not actually used anywhere, why bother to set it up? */
 	}
 }
 
@@ -480,8 +477,6 @@
 			MEM_freeN(entry->relname);
 		if (entry->path)
 			MEM_freeN(entry->path);
-		if (entry->string)
-			MEM_freeN(entry->string);
 		/* entry->poin assumed not to point to anything needing freeing here */
 	}
 

Modified: trunk/blender/source/blender/quicktime/apple/qtkit_import.m
===================================================================
--- trunk/blender/source/blender/quicktime/apple/qtkit_import.m	2013-03-05 06:26:10 UTC (rev 55042)
+++ trunk/blender/source/blender/quicktime/apple/qtkit_import.m	2013-03-05 06:38:43 UTC (rev 55043)
@@ -32,6 +32,7 @@
 #include "BLO_sys_types.h"
 #include "BKE_global.h"
 
+#include "BLI_utildefines.h"
 #include "BLI_dynstr.h"
 #include "BLI_path_util.h"