github
/
AROS-v0
mirror of https://github.com/deadw00d/AROS.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove remaining references to stdc, stdcio, posixc.

This commit is contained in:
deadwood 2021-12-14 10:07:35 +01:00
parent 10b553ea32
commit 9ac1329341
20 changed files with 43 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k-amiga/c/AROSBootstrap.c
View File

@ -468,7 +468,7 @@ static BOOL initDataPool(void)
}
/* Define these here for zlib so that we don't
* pull in stdc.library.
* pull in crt.library.
*
* We can't use AllocVec, since it's only
* been around since KS v36

2
compiler/alib/sprintf.c
View File

@ -45,7 +45,7 @@ const ULONG m68k_string_sprintf = 0x16c04e75;
{
#ifdef __mc68000
/* Special case for m68k, so that we are AmigaOS 1.x/2.x compliant
* New programs should be using snprintf() from stdc.library
* New programs should be using snprintf() from stdlib.library
*/
RawDoFmt(format, (RAWARG)(&format + 1), (VOID_FUNC)&m68k_string_sprintf,
buffer);

2
compiler/arossupport/hexdump.c
View File

@ -78,7 +78,7 @@
UBYTE c = ((UBYTE *)data)[t-i];
/*
* isprint() introduces dependency on stdc.library, which
* isprint() introduces dependency on stdlib.library, which
* prevents using this function from within KS code.
*/
if ((c > 0x1F) && (c < 0x7E))

2
compiler/crt/__crt_intbase.h
View File

@ -60,7 +60,7 @@ char ***__posixc_get_environptr(void);
/* When a program is started with the exec functions and from vfork,
this is indicated in the flags of the library.
This way the child can use the parent posixc.library during its
This way the child can use the parent crt.library during its
initialization phase */
#define EXEC_PARENT 0x00000001
#define VFORK_PARENT 0x00000002

11
compiler/crt/__crt_progonly.c
View File

@ -33,7 +33,7 @@ void __progonly_program_startup_internal(struct CrtProgCtx *ProgCtx, jmp_buf exi
/* FUNCTION
This is called during program startup and before calling main.
This is to allow stdc.library to do some initialization that couldn't
This is to allow crt.library to do some initialization that couldn't
be done when opening the library.
INPUTS
@ -78,7 +78,7 @@ void __progonly_program_startup_internal(struct CrtProgCtx *ProgCtx, jmp_buf exi
/* FUNCTION
This function is to be called when main() has returned or after
program has exited. This allows to stdc.library to do some
program has exited. This allows to crt.library to do some
cleanup that can't be done during closing of the library.
INPUTS
@ -251,9 +251,8 @@ void __progonly_program_startup_internal(struct CrtProgCtx *ProgCtx, jmp_buf exi
NOTES
In normal operation this function does not return.
If this function returns it means that this function was called in a
context where jmp_buf for exit was not initialized. Likely cause is
a module that opened stdc.library.
Be sure to capture this situation.
context where jmp_buf for exit was not initialized. Be sure to
capture this situation.
EXAMPLE
@ -267,7 +266,7 @@ void __progonly_program_startup_internal(struct CrtProgCtx *ProgCtx, jmp_buf exi
{
struct CrtProgCtx *ProgCtx = __aros_get_ProgCtx();
/* No __stdc_program_startup() called; Alert()
/* No __progonly_program_startup() called; Alert()
*/
if (!ProgCtx || ProgCtx->startup_errorptr == NULL)
{

5
compiler/crt/crt_system.c
View File

@ -56,9 +56,8 @@ int __progonly_execl_wrapper(const char *path, const char *arg, ...)
1 is return if string is NULL.
NOTES
The system() version of posixc.library will translate UNIX<>Amiga
if applicable as well as use a shell for executing text batch
commands.
The system() will translate UNIX<>Amiga if applicable as well as use
a shell for executing text batch commands.
EXAMPLE

2
compiler/startup/nixmain.c
View File

@ -11,7 +11,7 @@ AROS_IMPORT_ASM_SYM(int, dummy, __includecrtprogramstartuphandling);
extern int main(int argc, char *argv[]);
/* FIXME: This solution for -nix flag is now specific for posixc.library
/* FIXME: This solution for -nix flag is now specific for crt.library
Could a more general approach be provided so other libs can add their own
flags without needing to do something in compiler/startup
Is this wanted ?

2
compiler/stdc/include/aros/stdc/ctype.h
View File

@ -53,7 +53,7 @@ __ctype_make_func(isalnum, _istype(c,_ISalnum))
__ctype_make_func(toupper, (*__ctype_toupper_ptr)[((int)(c)) & 0xff])
__ctype_make_func(tolower, (*__ctype_tolower_ptr)[((int)(c)) & 0xff])
/* POSIX.1-2008/XSI extensions that are provided in stdc.library */
/* POSIX.1-2008/XSI extensions that are provided in stdlib.library */
__ctype_make_func(isascii, (c & ~0x7F) == 0)
__ctype_make_func(toascii, c & 0x7F)
#define _toupper(c) toupper(c)

4
compiler/stdc/include/aros/stdc/errno.h
View File

@ -73,7 +73,7 @@
*/
#define MAX_ERRNO 1000 /* Numbers should never be bigger than this value */
/* __STDC_ELAST gives the highest value of errno used by stdc.library */
/* __STDC_ELAST gives the highest value of errno used by crt.library */
#define __STDC_ELAST EILSEQ
__BEGIN_DECLS
@ -88,8 +88,6 @@ int *__stdc_geterrnoptr(void);
#endif
/* AROS specific functions to translate DOS error numbers to errno.
ioerrno2errno() will always call the function for the selected C
linklib, __stdc_ioerr2errno() is always the stdc.library version.
*/
int ioerr2errno(int ioerr);
int __stdc_ioerr2errno(int ioerr);

3
compiler/stdc/include/aros/stdc/string.h
View File

@ -6,9 +6,6 @@
$Id$
C99 & POSIX.1-2008 header file string.h with extra SAS/C and other extensions
Also the POSIX.1-2008 extension to string.h will be included in
stdc.library. This avoids opening of posixc.library by programs
that only use few simple POSIX string functions.
*/
#include <aros/system.h>

2
compiler/stdc/include/aros/stdc/time.h
View File

@ -48,7 +48,7 @@ struct tm *gmtime(const time_t *);
struct tm *localtime(const time_t *);
size_t strftime(char *, size_t, const char *, const struct tm *);
/* Reentrant versions are put as extension to C99 in stdc.library */
/* Reentrant versions are put as extension to C99 */
char *asctime_r(const struct tm *, char *);
char *ctime_r(const time_t *, char *);
struct tm *gmtime_r(const time_t *, struct tm *);

7
compiler/stdc/include/aros/stdc/wchar.h
View File

@ -33,10 +33,6 @@ struct __sFILE;
__BEGIN_DECLS
/*
* stdc.library (45 funcs)
*/
/* Formatted wide-character input/output functions */
/* NOTIMPL int swprintf(wchar_t * restrict s, size_t n,
const wchar_t * restrict format, ...); */
@ -113,9 +109,6 @@ size_t wcslen(const wchar_t *s);
/* NOTIMPL size_t wcsrtombs(char * restrict dst, const wchar_t ** restrict src,
size_t len, mbstate_t * restrict ps); */
/*
* stdcio.library
*/
/* Formatted wide-character input/output functions */
/* NOTIMPL int fwprintf(struct __sFILE * restrict stream,
const wchar_t * restrict format, ...); */

12
workbench/devs/AHI/Drivers/CMI8738/driver-init.c
View File

@ -36,7 +36,7 @@ struct DriverBase* AHIsubBase;
struct DosLibrary* DOSBase;
struct Library* ExpansionBase = NULL;
#ifdef __AROS__
struct Library * StdCBase = NULL;
struct Library * StdlibBase = NULL;
#endif
struct VendorDevice
@ -90,10 +90,10 @@ DriverInit( struct DriverBase* ahisubbase )
}
#ifdef __AROS__
StdCBase = OpenLibrary( "stdc.library", 0 );
if( StdCBase == NULL )
StdlibBase = OpenLibrary( "stdlib.library", 0 );
if( StdlibBase == NULL )
{
Req( "CMI8738: Unable to open 'stdc.library'.\n" );
Req( "CMI8738: Unable to open 'stdlib.library'.\n" );
return FALSE;
}
#endif
@ -225,8 +225,8 @@ DriverCleanup( struct DriverBase* AHIsubBase )
ahi_pci_exit();
#ifdef __AROS__
if (StdCBase)
CloseLibrary( StdCBase );
if (StdlibBase)
CloseLibrary( StdlibBase );
#endif
if (ExpansionBase)

12
workbench/devs/AHI/Drivers/HDAudio/driver-init.c
View File

@ -27,7 +27,7 @@ All Rights Reserved.
#include <clib/alib_protos.h>
#ifdef __AROS__
struct DosLibrary* DOSBase;
struct Library *StdCBase = NULL;
struct Library *StdlibBase = NULL;
#endif
#include <stdlib.h>
@ -79,10 +79,10 @@ BOOL DriverInit(struct DriverBase* ahisubbase)
}
#ifdef __AROS__
StdCBase = OpenLibrary("stdc.library", 0);
if (StdCBase == NULL)
StdlibBase = OpenLibrary("stdlib.library", 0);
if (StdlibBase == NULL)
{
Req("Unable to open 'stdc.library'.\n");
Req("Unable to open 'stdlib.library'.\n");
return FALSE;
}
#endif
@ -186,9 +186,9 @@ VOID DriverCleanup(struct DriverBase* AHIsubBase)
ahi_pci_exit();
#ifdef __AROS__
if (StdCBase)
if (StdlibBase)
{
CloseLibrary(StdCBase);
CloseLibrary(StdlibBase);
}
#endif

12
workbench/devs/AHI/Drivers/SB128/driver-init.c
View File

@ -33,7 +33,7 @@ struct DosLibrary* DOSBase;
struct DriverBase* AHIsubBase;
struct Library* ExpansionBase = NULL;
#ifdef __AROS__
struct Library *StdCBase = NULL;
struct Library *StdlibBase = NULL;
#endif
struct VendorDevice
@ -85,10 +85,10 @@ DriverInit( struct DriverBase* ahisubbase )
}
#ifdef __AROS__
StdCBase = OpenLibrary( "stdc.library", 0 );
if( StdCBase == NULL)
StdlibBase = OpenLibrary( "stdlib.library", 0 );
if( StdlibBase == NULL)
{
Req( "Unable to open 'stdc.library'.\n" );
Req( "Unable to open 'stdlib.library'.\n" );
return FALSE;
}
#endif
@ -254,8 +254,8 @@ DriverCleanup( struct DriverBase* AHIsubBase )
ahi_pci_exit();
#ifdef __AROS__
if (StdCBase)
CloseLibrary( StdCBase );
if (StdlibBase)
CloseLibrary( StdlibBase );
#endif
if (ExpansionBase)

2
workbench/devs/diskimage/device/include/diskimage_device.h
View File

@ -76,7 +76,7 @@ struct DiskImageBase {
struct Library *UtilityBase;
struct Library *IntuitionBase;
#ifdef __AROS__
struct Library *StdCBase;
struct Library *StdlibBase;
#endif
};

2
workbench/devs/diskimage/device/plugins.c
View File

@ -69,7 +69,7 @@ void LoadPlugins (struct DiskImageBase *libBase) {
plugin_data.UtilityBase = libBase->UtilityBase;
plugin_data.IPlugin = &IPluginIFace;
#ifdef __AROS__
plugin_data.StdCBase = libBase->StdCBase;
plugin_data.StdlibBase = libBase->StdlibBase;
#endif
libBase->HeaderTestSize = 0;

2
workbench/devs/diskimage/include/devices/diskimage.h
View File

@ -105,7 +105,7 @@ struct PluginData {
struct Library *UtilityBase;
struct DIPluginIFace *IPlugin;
#ifdef __AROS__
struct Library *StdCBase;
struct Library *StdlibBase;
#endif
};

4
workbench/devs/diskimage/plugins/cue/cue.c
View File

@ -123,7 +123,7 @@ struct DIPluginIFace *IPlugin;
struct Library *MPEGABase;
#endif
#if defined(USE_MPG123) && defined(__AROS__)
struct Library *StdCBase;
struct Library *StdlibBase;
#endif
#ifdef USE_MPG123
@ -138,7 +138,7 @@ BOOL CUE_Init (struct DiskImagePlugin *Self, const struct PluginData *data) {
IPlugin = data->IPlugin;
#ifdef USE_MPG123
#ifdef __AROS__
StdCBase = data->StdCBase;
StdlibBase = data->StdlibBase;
#endif
if (!malloc_init()) {
return FALSE;

14
workbench/devs/monitors/IntelGMA/intelgma_startup.c
View File

@ -23,8 +23,7 @@
struct Library *OOPBase;
struct Library *UtilityBase;
struct Library *StdCBase;
struct Library *StdCIOBase;
struct Library *StdlibBase;
OOP_AttrBase HiddPCIDeviceAttrBase;
OOP_AttrBase HiddGMABitMapAttrBase;
@ -105,9 +104,8 @@ int main(void)
}
UtilityBase = OpenLibrary("utility.library", 36);
StdCBase = OpenLibrary("stdc.library", 0);
StdCIOBase = OpenLibrary("stdcio.library", 0);
if (UtilityBase == NULL || StdCBase == NULL || StdCIOBase == NULL)
StdlibBase = OpenLibrary("stdlib.library", 0);
if (UtilityBase == NULL || StdlibBase == NULL)
success = FALSE;
if (success)
@ -277,10 +275,8 @@ int main(void)
OOP_ReleaseAttrBases(attrbases);
}
if (StdCIOBase != NULL)
CloseLibrary(StdCIOBase);
if (StdCBase != NULL)
CloseLibrary(StdCBase);
if (StdlibBase != NULL)
CloseLibrary(StdlibBase);
if (UtilityBase != NULL)
CloseLibrary(UtilityBase);
if (OOPBase != NULL)