Mercurial > dwindows
comparison os2/dirent.c @ 1341:184b3aedc2ff
Added PMPrintf support to dw_debug() on OS/2.
Also cleaned up tons of warnings generated by new versions of gcc on OS/2.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Mon, 14 Nov 2011 17:14:54 +0000 |
parents | d78f476c40f5 |
children | 56f311dc23f6 |
comparison
equal
deleted
inserted
replaced
1340:890890c31ba6 | 1341:184b3aedc2ff |
---|---|
78 | 78 |
79 drive[0] = '@' + unit; | 79 drive[0] = '@' + unit; |
80 drive[1] = ':'; | 80 drive[1] = ':'; |
81 drive[2] = '\0'; | 81 drive[2] = '\0'; |
82 infolen = sizeof info; | 82 infolen = sizeof info; |
83 if (DosQueryFSAttach(drive, 0, FSAIL_QUERYNAME, (PVOID)info, &infolen)) | 83 if (DosQueryFSAttach((PSZ)drive, 0, FSAIL_QUERYNAME, (PVOID)info, &infolen)) |
84 return 0; | 84 return 0; |
85 if (infolen >= sizeof(FSQBUFFER2)) { | 85 if (infolen >= sizeof(FSQBUFFER2)) { |
86 FSQBUFFER2 *p = (FSQBUFFER2 *)info; | 86 FSQBUFFER2 *p = (FSQBUFFER2 *)info; |
87 r = p->szFSDName[p->cbName]; | 87 r = p->szFSDName[p->cbName]; |
88 } else | 88 } else |
141 dir->fstype = getFSType(dir->name); | 141 dir->fstype = getFSType(dir->name); |
142 dir->attrmask = att_mask | A_DIR; | 142 dir->attrmask = att_mask | A_DIR; |
143 | 143 |
144 dir->handle = HDIR_CREATE; | 144 dir->handle = HDIR_CREATE; |
145 dir->count = 100; | 145 dir->count = 100; |
146 rc = DosFindFirst(dir->name, &dir->handle, dir->attrmask, | 146 rc = DosFindFirst((PSZ)dir->name, &dir->handle, dir->attrmask, |
147 dir->ffbuf, sizeof dir->ffbuf, &dir->count, FIL_STANDARD); | 147 dir->ffbuf, sizeof dir->ffbuf, &dir->count, FIL_STANDARD); |
148 switch (rc) { | 148 switch (rc) { |
149 default: | 149 default: |
150 free(dir); | 150 free(dir); |
151 error(rc); | 151 error(rc); |
230 strcpy(name, dir->name); | 230 strcpy(name, dir->name); |
231 strcat(name, "*"); | 231 strcat(name, "*"); |
232 | 232 |
233 dir->handle = HDIR_CREATE; | 233 dir->handle = HDIR_CREATE; |
234 dir->count = 32767; | 234 dir->count = 32767; |
235 rc = DosFindFirst(name, &dir->handle, dir->attrmask, | 235 rc = DosFindFirst((PSZ)name, &dir->handle, dir->attrmask, |
236 dir->ffbuf, sizeof dir->ffbuf, &dir->count, FIL_STANDARD); | 236 dir->ffbuf, sizeof dir->ffbuf, &dir->count, FIL_STANDARD); |
237 switch (rc) { | 237 switch (rc) { |
238 default: | 238 default: |
239 error(rc); | 239 error(rc); |
240 return; | 240 return; |