DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2013-11-23 03:03:47 +01:00
parent 535593184b
commit 4728b92e29
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/desktop.c
View File

@ -1077,18 +1077,20 @@ static int _current_loop_applications(Desktop * desktop)
&& de->d_name[2] == '\0')) && de->d_name[2] == '\0'))
continue; continue;
len = strlen(de->d_name); len = strlen(de->d_name);
if(len < sizeof(ext) || strncmp(&de->d_name[len - sizeof(ext) if(len < sizeof(ext))
+ 1], ext, sizeof(ext)) != 0)
continue; continue;
if((p = realloc(path, desktop->path_cnt + len + 1)) == NULL) if(strncmp(&de->d_name[len - sizeof(ext) + 1], ext,
sizeof(ext)) != 0)
continue;
len = desktop->path_cnt + len + 1;
if((p = realloc(path, len)) == NULL)
{ {
error_set_print("desktop", 1, "%s: %s", "realloc", error_set_print("desktop", 1, "%s: %s", "realloc",
strerror(errno)); strerror(errno));
continue; continue;
} }
path = p; path = p;
snprintf(path, desktop->path_cnt + len + 1, "%s/%s", snprintf(path, len, "%s/%s", desktop->path, de->d_name);
desktop->path, de->d_name);
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s() \"%s\"\n", __func__, path); fprintf(stderr, "DEBUG: %s() \"%s\"\n", __func__, path);
#endif #endif
@ -1130,18 +1132,20 @@ static int _current_loop_categories(Desktop * desktop)
&& de->d_name[2] == '\0')) && de->d_name[2] == '\0'))
continue; continue;
len = strlen(de->d_name); len = strlen(de->d_name);
if(len < sizeof(ext) || strncmp(&de->d_name[len - sizeof(ext) if(len < sizeof(ext))
+ 1], ext, sizeof(ext)) != 0)
continue; continue;
if((p = realloc(path, desktop->path_cnt + len + 1)) == NULL) if(strncmp(&de->d_name[len - sizeof(ext) + 1], ext,
sizeof(ext)) != 0)
continue;
len = desktop->path_cnt + len + 1;
if((p = realloc(path, len)) == NULL)
{ {
error_set_print("desktop", 1, "%s: %s", "realloc", error_set_print("desktop", 1, "%s: %s", "realloc",
strerror(errno)); strerror(errno));
continue; continue;
} }
path = p; path = p;
snprintf(path, desktop->path_cnt + len + 1, "%s/%s", snprintf(path, len, "%s/%s", desktop->path, de->d_name);
desktop->path, de->d_name);
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s() \"%s\"\n", __func__, path); fprintf(stderr, "DEBUG: %s() \"%s\"\n", __func__, path);
#endif #endif