deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Removed compiler warnings.

Browse source
This commit is contained in:
oliverschmidt 2007-11-18 02:36:07 +00:00
parent 6ab83029c3
commit c1e1249bc2
2 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
platform/win32/cfs/cfs-win32.c
View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: cfs-win32.c,v 1.2 2007/05/19 21:38:22 oliverschmidt Exp $ * $Id: cfs-win32.c,v 1.3 2007/11/18 02:36:30 oliverschmidt Exp $
*/ */
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@ -39,15 +39,24 @@
#include <stdio.h> #include <stdio.h>
#include <io.h> #include <io.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef __CYGWIN__
#include <unistd.h>
#else
#define open _open
#define close _close
#define read _read
#define write _write
#define lseek _lseek
#endif
#include "contiki.h" #include "contiki.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
struct cfs_win32_dir { struct cfs_win32_dir {
HANDLE handle; HANDLE handle;
unsigned char* name; char* name;
unsigned int size; unsigned int size;
}; };
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -55,34 +64,34 @@ int
cfs_open(const char *n, int f) cfs_open(const char *n, int f)
{ {
if(f == CFS_READ) { if(f == CFS_READ) {
return _open(n, O_RDONLY); return open(n, O_RDONLY);
} else { } else {
return _open(n, O_CREAT|O_TRUNC|O_RDWR); return open(n, O_CREAT|O_TRUNC|O_RDWR);
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
cfs_close(int f) cfs_close(int f)
{ {
_close(f); close(f);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
cfs_read(int f, char *b, unsigned int l) cfs_read(int f, void *b, unsigned int l)
{ {
return _read(f, b, l); return read(f, b, l);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
cfs_write(int f, char *b, unsigned int l) cfs_write(int f, void *b, unsigned int l)
{ {
return _write(f, b, l); return write(f, b, l);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
cfs_seek(int f, unsigned int o) cfs_seek(int f, unsigned int o)
{ {
return _lseek(f, o, SEEK_SET); return lseek(f, o, SEEK_SET);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
@ -108,7 +117,7 @@ cfs_opendir(struct cfs_dir *p, const char *n)
return 1; return 1;
} }
dir->name = _strdup(data.cFileName); dir->name = strdup(data.cFileName);
dir->size = ((data.nFileSizeLow + 511) / 512) % 1000; dir->size = ((data.nFileSizeLow + 511) / 512) % 1000;
return 0; return 0;
@ -133,7 +142,7 @@ cfs_readdir(struct cfs_dir *p, struct cfs_dirent *e)
return 0; return 0;
} }
dir->name = _strdup(data.cFileName); dir->name = strdup(data.cFileName);
dir->size = ((data.nFileSizeLow + 511) / 512) % 1000; dir->size = ((data.nFileSizeLow + 511) / 512) % 1000;
return 0; return 0;

16
platform/win32/loader/dll-loader.c
View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: dll-loader.c,v 1.1 2006/08/13 16:49:43 oliverschmidt Exp $ * $Id: dll-loader.c,v 1.2 2007/11/18 02:36:07 oliverschmidt Exp $
*/ */
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@ -44,7 +44,7 @@ int
dll_loader_load(char *name, char *arg) dll_loader_load(char *name, char *arg)
{ {
HMODULE handle; HMODULE handle;
struct process **p; FARPROC p;
/* Load and link the program. */ /* Load and link the program. */
handle = LoadLibrary(name); handle = LoadLibrary(name);
@ -55,15 +55,15 @@ dll_loader_load(char *name, char *arg)
} }
/* Find the main process of the loaded program. */ /* Find the main process of the loaded program. */
p = (struct process **)GetProcAddress(handle, "process_load"); p = GetProcAddress(handle, "process_load");
if(p == NULL) { if(p == NULL) {
debug_printf("dll_loader_load: could not find process startpoint 'process_load'\n"); debug_printf("dll_loader_load: could not find process startpoint 'process_load'\n");
return LOADER_ERR_READ; return LOADER_ERR_READ;
} }
/* Start the process. */ /* Start the process. */
debug_printf("Starting '%s'\n", (*p)->name); debug_printf("Starting '%s'\n", (**(struct process***)&p)->name);
process_start(*p, arg); process_start(**(struct process***)&p, arg);
return LOADER_OK; return LOADER_OK;
} }
@ -79,8 +79,8 @@ struct dsc *
dll_loader_load_dsc(char *name) dll_loader_load_dsc(char *name)
{ {
HMODULE handle; HMODULE handle;
FARPROC d;
char symbol[24]; char symbol[24];
struct dsc *d;
handle = LoadLibrary(name); handle = LoadLibrary(name);
@ -92,13 +92,13 @@ dll_loader_load_dsc(char *name)
strcpy(symbol, name); strcpy(symbol, name);
*strchr(symbol, '.') = '_'; *strchr(symbol, '.') = '_';
d = (struct dsc *)GetProcAddress(handle, symbol); d = GetProcAddress(handle, symbol);
if(d == NULL) { if(d == NULL) {
debug_printf("dll_loader_load_dsc: could not find symbol '%s'\n", symbol); debug_printf("dll_loader_load_dsc: could not find symbol '%s'\n", symbol);
return NULL; return NULL;
} }
return d; return *(struct dsc **)&d;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void __stdcall void __stdcall