summaryrefslogtreecommitdiff
path: root/src/scandir_win32.c
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2005-04-14 13:56:07 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2005-04-14 13:56:07 +0000
commit70c4cd102f437a1379a66b036cd0f26837d003ea (patch)
treef700115eb2cd5a895d8be710b5ed16a80185c601 /src/scandir_win32.c
parent217f77c9ef015684b08f77b2d129155c76414f9e (diff)
Fix compiler warnings.
Use fl_yes and fl_no for the Forms emulation, instead of the hardcoded strings. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4283 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/scandir_win32.c')
-rw-r--r--src/scandir_win32.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scandir_win32.c b/src/scandir_win32.c
index 1bf9fe7dc..e5b11ba6e 100644
--- a/src/scandir_win32.c
+++ b/src/scandir_win32.c
@@ -43,7 +43,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
unsigned long ret;
len = strlen(dirname);
- findIn = (char *)malloc(len+5);
+ findIn = (char *)malloc((size_t)(len+5));
if (!findIn) return -1;
@@ -72,7 +72,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
}
if (!select || (*select)(selectDir)) {
if (nDir==NDir) {
- struct dirent **tempDir = (struct dirent **)calloc(sizeof(struct dirent*), NDir+33);
+ struct dirent **tempDir = (struct dirent **)calloc(sizeof(struct dirent*), (size_t)(NDir+33));
if (NDir) memcpy(tempDir, dir, sizeof(struct dirent*)*NDir);
if (dir) free(dir);
dir = tempDir;
@@ -94,8 +94,8 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
free (findIn);
- if (compar) qsort (dir, nDir, sizeof(*dir),
- (int(*)(const void*, const void*))compar);
+ if (compar) qsort(dir, (size_t)nDir, sizeof(*dir),
+ (int(*)(const void*, const void*))compar);
*namelist = dir;
return nDir;