notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

indent, and tr -d "\r", win32_dirent.c & .h

Browse source 
Ran indent on win32_dirent.* and also removed MSDOS CR ("^M" aka "\r")
This commit is contained in:
Bill Kendrick 2017-10-15 11:09:17 -07:00
parent 4aabc2da43
commit f8c4dc626c
2 changed files with 192 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/win32_dirent.c
View file

@ -38,6 +38,7 @@
DIR * opendir(const char *pSpec) DIR * opendir(const char *pSpec)
{ {
char pathname[MAX_PATH + 2]; char pathname[MAX_PATH + 2];
DIR * pDir = calloc(1, sizeof(DIR)); DIR * pDir = calloc(1, sizeof(DIR));
if (!pDir) if (!pDir)
return NULL; return NULL;
@ -51,18 +52,19 @@
pDir = NULL; pDir = NULL;
} }
return pDir; return pDir;
} }
void closedir(DIR * pDir)
void closedir(DIR * pDir)
{ {
assert(pDir != NULL); assert(pDir != NULL);
free(pDir); free(pDir);
} struct dirent *readdir(struct DIR *pDir) } struct dirent *readdir(struct DIR *pDir)
{ {
assert(pDir != NULL); assert(pDir != NULL);
if (pDir->hFind) if (pDir->hFind)
{ {
strcpy(pDir->de.d_name, (const char *) pDir->wfd.cFileName); strcpy(pDir->de.d_name, (const char *)pDir->wfd.cFileName);
if (!FindNextFile(pDir->hFind, &pDir->wfd)) if (!FindNextFile(pDir->hFind, &pDir->wfd))
{ {
@ -72,38 +74,34 @@
return &pDir->de; return &pDir->de;
} }
return NULL; return NULL;
} }
int alphasort(const void *a, const void *b)
int alphasort(const void *a, const void *b)
{ {
return (strcmp return (strcmp((*(const struct dirent **)a)->d_name, (*(const struct dirent **)b)->d_name));
((*(const struct dirent **) a)->d_name, } static int addToList(int i, struct dirent ***namelist, struct dirent *entry)
(*(const struct dirent **) b)->d_name));
} static int addToList(int i, struct dirent ***namelist,
struct dirent *entry)
{ {
int size; int size;
struct dirent *block; struct dirent *block;
*namelist =
(struct dirent **) realloc((void *) (*namelist), *namelist = (struct dirent **)realloc((void *)(*namelist), (size_t) ((i + 1) * sizeof(struct dirent *)));
(size_t) ((i + 1) * sizeof(struct dirent *)));
if (*namelist == NULL) if (*namelist == NULL)
return -1; return -1;
size = size = (((char *)&entry->d_name) - ((char *)entry)) + strlen(entry->d_name) + 1;
(((char *) &entry->d_name) - ((char *) entry)) + strlen(entry->d_name) + block = (struct dirent *)malloc(size);
1;
block = (struct dirent *) malloc(size);
if (block == NULL) if (block == NULL)
return -1; return -1;
(*namelist)[i] = block; (*namelist)[i] = block;
memcpy(block, entry, size); memcpy(block, entry, size);
return ++i; return ++i;
} }
int scandir(const char *dir, struct dirent ***namelist, selectCB select,
comparCB compar) int scandir(const char *dir, struct dirent ***namelist, selectCB select, comparCB compar)
{ {
DIR * pDir; DIR * pDir;
int count; int count;
struct dirent *entry; struct dirent *entry;
assert((dir != NULL) && (namelist != NULL)); assert((dir != NULL) && (namelist != NULL));
pDir = opendir(dir); pDir = opendir(dir);
if (!pDir) if (!pDir)
@ -120,9 +118,8 @@
if (count <= 0) if (count <= 0)
return -1; return -1;
if (compar != NULL) if (compar != NULL)
qsort((void *) (*namelist), (size_t) count, sizeof(struct dirent *), qsort((void *)(*namelist), (size_t) count, sizeof(struct dirent *), compar);
compar);
return count; return count;
} }

43
src/win32_dirent.h
View file

@ -8,20 +8,21 @@
/* */ /* */
/****************************************************/ /****************************************************/
/* $Id$ */ /* $Id$ */
typedef long BOOL; typedef long BOOL;
typedef unsigned int DWORD; typedef unsigned int DWORD;
typedef wchar_t TCHAR; typedef wchar_t TCHAR;
typedef void *HANDLE; typedef void *HANDLE;
#define MAX_PATH 256 #define MAX_PATH 256
#define INVALID_HANDLE_VALUE ((HANDLE)(-1)) #define INVALID_HANDLE_VALUE ((HANDLE)(-1))
#define WINAPI __stdcall #define WINAPI __stdcall
typedef struct typedef struct
{ {
DWORD dwLowDateTime; DWORD dwLowDateTime;
DWORD dwHighDateTime; DWORD dwHighDateTime;
} FILETIME; } FILETIME;
typedef struct typedef struct
{ {
DWORD dwFileAttributes; DWORD dwFileAttributes;
FILETIME ftCreationTime; FILETIME ftCreationTime;
@ -33,7 +34,8 @@
DWORD dwReserved1; DWORD dwReserved1;
TCHAR cFileName[MAX_PATH]; TCHAR cFileName[MAX_PATH];
TCHAR cAlternateFileName[14]; TCHAR cAlternateFileName[14];
} WIN32_FIND_DATA; } WIN32_FIND_DATA;
#define FindFirstFile FindFirstFileA #define FindFirstFile FindFirstFileA
#define FindNextFile FindNextFileA #define FindNextFile FindNextFileA
@ -51,23 +53,24 @@ extern "C"
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif /* */ #endif /* */
struct dirent struct dirent
{ {
char d_name[MAX_PATH]; char d_name[MAX_PATH];
}; };
typedef struct typedef struct
{ {
WIN32_FIND_DATA wfd; WIN32_FIND_DATA wfd;
HANDLE hFind; HANDLE hFind;
struct dirent de; struct dirent de;
} DIR; } DIR;
extern DIR *opendir(const char *pSpec); extern DIR *opendir(const char *pSpec);
extern void closedir(DIR * pDir); extern void closedir(DIR * pDir);
extern struct dirent *readdir(struct DIR *pDir); extern struct dirent *readdir(struct DIR *pDir);
typedef int (*selectCB) (const struct dirent *); typedef int (*selectCB) (const struct dirent *);
typedef int (*comparCB) (const void *, const void *); typedef int (*comparCB) (const void *, const void *);
extern int alphasort(const void *a, const void *b); extern int alphasort(const void *a, const void *b);
extern int scandir(const char *dir, struct dirent ***namelist, extern int scandir(const char *dir, struct dirent ***namelist, selectCB select, comparCB compar);
selectCB select, comparCB compar);