Revision: 56010
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56010
Author: campbellbarton
Date: 2013-04-13 14:57:08 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
code cleanup: remove unused string formatting in bli_adddirstrings(), also
remove unused initializations and comment unused vars.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/context.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
Modified: trunk/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/context.c 2013-04-13
14:15:16 UTC (rev 56009)
+++ trunk/blender/source/blender/blenkernel/intern/context.c 2013-04-13
14:57:08 UTC (rev 56010)
@@ -85,9 +85,11 @@
} data;
/* data evaluation */
+#if 0
struct {
int render;
} eval;
+#endif
};
/* context */
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c 2013-04-13
14:15:16 UTC (rev 56009)
+++ trunk/blender/source/blender/blenlib/intern/storage.c 2013-04-13
14:57:08 UTC (rev 56010)
@@ -311,16 +311,14 @@
*/
static void bli_adddirstrings(struct BuildDirCtx *dir_ctx)
{
- char datum[100];
-// char buf[512]; // UNUSED
- char size[250];
const char *types[8] = {"---", "--x", "-w-", "-wx", "r--", "r-x",
"rw-", "rwx"};
/* symbolic display, indexed by mode field value */
- int num, mode;
+ int num;
#ifdef WIN32
__int64 st_size;
#else
off_t st_size;
+ int mode;
#endif
struct direntry *file;
@@ -328,8 +326,10 @@
time_t zero = 0;
for (num = 0, file = dir_ctx->files; num < dir_ctx->nrfiles; num++,
file++) {
+
+
+ /* Mode */
#ifdef WIN32
- mode = 0;
BLI_strncpy(file->mode1, types[0], sizeof(file->mode1));
BLI_strncpy(file->mode2, types[0], sizeof(file->mode2));
BLI_strncpy(file->mode3, types[0], sizeof(file->mode3));
@@ -355,6 +355,8 @@
}
#endif
+
+ /* User */
#ifdef WIN32
strcpy(file->owner, "user");
#else
@@ -370,12 +372,16 @@
}
#endif
+
+ /* Time */
tm = localtime(&file->s.st_mtime);
// prevent impossible dates in windows
if (tm == NULL) tm = localtime(&zero);
strftime(file->time, sizeof(file->time), "%H:%M", tm);
strftime(file->date, sizeof(file->date), "%d-%b-%y", tm);
+
+ /* Size */
/*
* Seems st_size is signed 32-bit value in *nix and Windows.
This
* will buy us some time until files get bigger than 4GB or
until
@@ -398,32 +404,6 @@
else {
BLI_snprintf(file->size, sizeof(file->size), "%d B",
(int)st_size);
}
-
- strftime(datum, 32, "%d-%b-%y %H:%M", tm); /* XXX, is this
used? - campbell */
-
- if (st_size < 1000) {
- BLI_snprintf(size, sizeof(size), "%10d",
- (int) st_size);
- }
- else if (st_size < 1000 * 1000) {
- BLI_snprintf(size, sizeof(size), "%6d %03d",
- (int) (st_size / 1000), (int) (st_size %
1000));
- }
- else if (st_size < 100 * 1000 * 1000) {
- BLI_snprintf(size, sizeof(size), "%2d %03d %03d",
- (int) (st_size / (1000 * 1000)), (int)
((st_size / 1000) % 1000), (int) (st_size % 1000));
- }
- else {
- /* XXX, whats going on here?. 2x calls - campbell */
- BLI_snprintf(size, sizeof(size), "> %4.1f M", (double)
(st_size / (1024.0 * 1024.0)));
- BLI_snprintf(size, sizeof(size), "%10d", (int) st_size);
- }
-
-#if 0
- 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);
-#endif
}
}
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2013-04-13
14:15:16 UTC (rev 56009)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2013-04-13
14:57:08 UTC (rev 56010)
@@ -7365,7 +7365,6 @@
bNodeSocket *old_image = BLI_findlink(&node->inputs, 0);
bNodeSocket *old_z = BLI_findlink(&node->inputs, 1);
bNodeSocket *sock;
- char basepath[FILE_MAXDIR];
char filename[FILE_MAXFILE];
/* ugly, need to remove the old inputs list to avoid
bad pointer checks when adding new sockets.
@@ -7377,6 +7376,8 @@
/* looks like storage data can be messed up somehow,
stupid check here */
if (old_data) {
+ char basepath[FILE_MAXDIR];
+
/* split off filename from the old path, to be
used as socket sub-path */
BLI_split_dirfile(old_data->name, basepath,
filename, sizeof(basepath), sizeof(filename));
@@ -7384,7 +7385,6 @@
nimf->format = old_data->im_format;
}
else {
- basepath[0] = '\0';
BLI_strncpy(filename, old_image->name,
sizeof(filename));
}
Modified: trunk/blender/source/blender/editors/space_file/file_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_draw.c 2013-04-13
14:15:16 UTC (rev 56009)
+++ trunk/blender/source/blender/editors/space_file/file_draw.c 2013-04-13
14:57:08 UTC (rev 56010)
@@ -389,7 +389,6 @@
uiButSetDragImage(but, file->path, get_file_icon(file), imb,
scale);
glDisable(GL_BLEND);
- imb = NULL;
}
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2013-04-13 14:15:16 UTC (rev 56009)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2013-04-13 14:57:08 UTC (rev 56010)
@@ -3969,7 +3969,7 @@
bool ED_view3d_autodist(Scene *scene, ARegion *ar, View3D *v3d, const int
mval[2], float mouse_worldloc[3], bool alphaoverride)
{
bglMats mats; /* ZBuffer depth vars */
- float depth_close = FLT_MAX;
+ float depth_close;
double cent[2], p[3];
/* Get Z Depths, needed for perspective, nice for ortho */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
2013-04-13 14:15:16 UTC (rev 56009)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
2013-04-13 14:57:08 UTC (rev 56010)
@@ -95,7 +95,7 @@
{
float dist_px = 12; /* snap dist */
float r_no_dummy[3];
- bool ret = false;
+ bool ret;
Scene *scene = CTX_data_scene(C);
View3D *v3d = CTX_wm_view3d(C);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
