Fix warning VC++ and fix applied fisrt to source 4.1
This commit is contained in:
parent
219f4f9725
commit
2e238f7eff
@ -68,6 +68,7 @@ miguel@hegel.(none)
|
|||||||
miguel@hegel.br
|
miguel@hegel.br
|
||||||
miguel@hegel.local
|
miguel@hegel.local
|
||||||
miguel@hegel.txg
|
miguel@hegel.txg
|
||||||
|
miguel@hegel.txg.br
|
||||||
miguel@light.
|
miguel@light.
|
||||||
miguel@light.local
|
miguel@light.local
|
||||||
miguel@sartre.local
|
miguel@sartre.local
|
||||||
|
@ -461,17 +461,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
|
|||||||
else
|
else
|
||||||
finfo.mystat= NULL;
|
finfo.mystat= NULL;
|
||||||
|
|
||||||
/*
|
|
||||||
If the directory is the root directory of the drive, Windows sometimes
|
|
||||||
creates hidden or system files there (like RECYCLER); do not show
|
|
||||||
them. We would need to see how this can be achieved with a Borland
|
|
||||||
compiler.
|
|
||||||
*/
|
|
||||||
#ifndef __BORLANDC__
|
|
||||||
if (attrib & (_A_HIDDEN | _A_SYSTEM))
|
|
||||||
continue;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (push_dynamic(dir_entries_storage, (gptr)&finfo))
|
if (push_dynamic(dir_entries_storage, (gptr)&finfo))
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
|
@ -33,17 +33,6 @@
|
|||||||
length of result string
|
length of result string
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int my_snprintf(char* to, size_t n, const char* fmt, ...)
|
|
||||||
{
|
|
||||||
int result;
|
|
||||||
va_list args;
|
|
||||||
va_start(args,fmt);
|
|
||||||
result= my_vsnprintf(to, n, fmt, args);
|
|
||||||
va_end(args);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
|
int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
|
||||||
{
|
{
|
||||||
char *start=to, *end=to+n-1;
|
char *start=to, *end=to+n-1;
|
||||||
@ -140,6 +129,15 @@ int my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap)
|
|||||||
return (uint) (to - start);
|
return (uint) (to - start);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int my_snprintf(char* to, size_t n, const char* fmt, ...)
|
||||||
|
{
|
||||||
|
int result;
|
||||||
|
va_list args;
|
||||||
|
va_start(args,fmt);
|
||||||
|
result= my_vsnprintf(to, n, fmt, args);
|
||||||
|
va_end(args);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef MAIN
|
#ifdef MAIN
|
||||||
#define OVERRUN_SENTRY 250
|
#define OVERRUN_SENTRY 250
|
||||||
|
Loading…
x
Reference in New Issue
Block a user