libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced some large local variables by other means in libburn/sg-dummy.c

Browse Source
This commit is contained in:
Thomas Schmitt 2011-05-23 16:34:53 +00:00
parent d6cb95e554
commit afc3dfd619
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libburn/trunk/cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2011.05.23.155217" #define Cdrskin_timestamP "2011.05.23.163506"

22
libburn/trunk/libburn/sg-dummy.c
View File

@ -251,9 +251,12 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
struct statvfs vfsbuf; struct statvfs vfsbuf;
#endif #endif
char testpath[4096], *cpt; char *testpath = NULL, *cpt;
long blocks; long blocks;
off_t add_size = 0; off_t add_size = 0;
int ret;
BURN_ALLOC_MEM(testpath, char, 4096);
testpath[0] = 0; testpath[0] = 0;
blocks = *bytes / 512; blocks = *bytes / 512;
@ -267,18 +270,18 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
else else
*cpt = 0; *cpt = 0;
if (stat(testpath, &stbuf) == -1) if (stat(testpath, &stbuf) == -1)
return -1; {ret = -1; goto ex;}
#ifdef Libburn_if_this_was_linuX #ifdef Libburn_if_this_was_linuX
} else if(S_ISBLK(stbuf.st_mode)) { } else if(S_ISBLK(stbuf.st_mode)) {
fd = open(path, open_mode); fd = open(path, open_mode);
if (fd == -1) if (fd == -1)
return -2; {ret = -2; goto ex;}
ret = ioctl(fd, BLKGETSIZE, &blocks); ret = ioctl(fd, BLKGETSIZE, &blocks);
close(fd); close(fd);
if (ret == -1) if (ret == -1)
return -2; {ret = -2; goto ex;}
*bytes = ((off_t) blocks) * (off_t) 512; *bytes = ((off_t) blocks) * (off_t) 512;
#endif /* Libburn_if_this_was_linuX */ #endif /* Libburn_if_this_was_linuX */
@ -287,25 +290,28 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
add_size = stbuf.st_blocks * (off_t) 512; add_size = stbuf.st_blocks * (off_t) 512;
strcpy(testpath, path); strcpy(testpath, path);
} else } else
return 0; {ret = 0; goto ex;}
if (testpath[0]) { if (testpath[0]) {
#ifdef Libburn_os_has_statvfS #ifdef Libburn_os_has_statvfS
if (statvfs(testpath, &vfsbuf) == -1) if (statvfs(testpath, &vfsbuf) == -1)
return -2; {ret = -2; goto ex;}
*bytes = add_size + ((off_t) vfsbuf.f_frsize) * *bytes = add_size + ((off_t) vfsbuf.f_frsize) *
(off_t) vfsbuf.f_bavail; (off_t) vfsbuf.f_bavail;
#else /* Libburn_os_has_statvfS */ #else /* Libburn_os_has_statvfS */
return 0; {ret = 0; goto ex;}
#endif /* ! Libburn_os_has_stavtfS */ #endif /* ! Libburn_os_has_stavtfS */
} }
return 1; ret = 1;
ex:;
BURN_FREE_MEM(testpath);
return ret;
} }