xorg/tests: minor fixes

ulab-original
Jay Sorg 13 years ago
parent 3e90b6c9cf
commit c37524c733

@ -578,14 +578,20 @@ g_tcp_select(int sck1, int sck2)
return rv; return rv;
} }
/*****************************************************************************/ /*****************************************************************************/
void APP_CC void APP_CC
g_random(char* data, int len) g_random(char* data, int len)
{ {
#if defined(_WIN32) #if defined(_WIN32)
memset(data, 0x44, len); int index;
#else
srand(g_time1());
for (index = 0; index < len; index++)
{
data[index] = (char)rand(); /* rand returns a number between 0 and
RAND_MAX */
}
#else
int fd; int fd;
memset(data, 0x44, len); memset(data, 0x44, len);
@ -596,13 +602,14 @@ g_random(char* data, int len)
} }
if (fd != -1) if (fd != -1)
{ {
read(fd, data, len); if (read(fd, data, len) != len)
{
}
close(fd); close(fd);
} }
#endif #endif
} }
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
g_abs(int i) g_abs(int i)
@ -802,7 +809,6 @@ g_mkdir(const char* dirname)
#endif #endif
} }
/*****************************************************************************/ /*****************************************************************************/
/* gets the current working directory and puts up to maxlen chars in /* gets the current working directory and puts up to maxlen chars in
dirname dirname
@ -810,16 +816,17 @@ g_mkdir(const char* dirname)
char* APP_CC char* APP_CC
g_get_current_dir(char* dirname, int maxlen) g_get_current_dir(char* dirname, int maxlen)
{ {
#if defined(_WIN32) #if defined(_WIN32)
GetCurrentDirectory(maxlen, dirname); GetCurrentDirectoryA(maxlen, dirname);
return 0; return 0;
#else #else
getcwd(dirname, maxlen); if (getcwd(dirname, maxlen) == 0)
{
}
return 0; return 0;
#endif #endif
} }
/*****************************************************************************/ /*****************************************************************************/
/* returns error, zero on success and -1 on failure */ /* returns error, zero on success and -1 on failure */
int APP_CC int APP_CC

Loading…
Cancel
Save