LIV2/libnix
1
0
Fork 0
mirror of https://github.com/LIV2/libnix.git synced 2025-12-06 00:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings

Browse Source
This commit is contained in:
bebbo 2024-05-08 15:39:18 +02:00
parent 0ecbaf5c17
commit 8dd0ab59d1
16 changed files with 128 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
*~
.DS_Store
libnix*
lib*

4
sources/amiga/misc/ArgArray.c
View File

@ -52,7 +52,7 @@ STRPTR ArgString(UBYTE **tt, STRPTR entry, STRPTR defstr)
{
STRPTR str;
if (!entry || !(str=FindToolType(tt,entry)))
if (!entry || !(str=FindToolType((CONST_STRPTR*)tt,entry)))
str=defstr;
return str;
}
@ -61,7 +61,7 @@ LONG ArgInt(UBYTE **tt, STRPTR entry, long defval)
{
STRPTR str;
if (entry && (str=FindToolType(tt,entry)))
if (entry && (str=FindToolType((CONST_STRPTR*)tt,entry)))
StrToLong(str,&defval);
return defval;
}

12
sources/nix/extra/chdir.c
View File

@ -1,6 +1,8 @@
#include <proto/dos.h>
#include <stdlib.h>
#include <unistd.h>
#include <proto/dos.h>
#include "stabs.h"
extern void __seterrno(void);
@ -28,9 +30,11 @@ int fchdir(int fd) {
StdFileDes *sfd = _lx_fhfromfd(fd);
if (!sfd)
return ERROR_DIR_NOT_FOUND;
char buffer[256];
NameFromLock(sfd->lx_fh, buffer, 255);
return chdir(buffer);
BPTR old = CurrentDir(sfd->lx_fh);
if (old)
UnLock(old);
return old != 0;
}
void __initchdir(void)

2
sources/nix/extra/chmod.c
View File

@ -6,7 +6,9 @@
#include <sys/stat.h>
extern void __seterrno(void);
#ifdef IXPATHS
extern char *__amigapath(const char *path);
#endif
int chmod(const char *name, mode_t mode)
{

6
sources/nix/locale/gettext.c
View File

@ -1,10 +1,10 @@
#include <libintl.h>
__stdargs char * gettext (const char * msgid) {
return msgid;
return (char *)msgid;
}
__stdargs char * dgettext (const char * domainname,const char * msgid) {
return msgid;
return (char *)msgid;
}
__stdargs char * dcgettext (const char * domainname, const char* msgid, int category) {
return msgid;
return (char *)msgid;
}

1
sources/nix/locale/locale.c
View File

@ -1,4 +1,5 @@
#include <locale.h>
#include <string.h>
struct __locale_t {
int unknown;

2
sources/nix/locale/textdomain.c
View File

@ -2,5 +2,5 @@
static char * __domain;
char * textdomain (const char * domainname) {
return __domain = domainname;
return __domain = (char *)domainname;
}

2
sources/nix/misc/stkchk.c
View File

@ -1,3 +1,5 @@
#include <string.h>
#include <exec/execbase.h>
#include <proto/dos.h>
#include <proto/exec.h>

3
sources/nix/string/strcmp.c
View File

@ -13,6 +13,7 @@ int strcmp(const char *p1,const char *p2)
a = *--p1;
b = *--p2;
return (short)a - b;
break;
}
return (short)a - b;
}

3
sources/nix/string/wcsncmp.c
View File

@ -17,7 +17,8 @@ int wcsncmp(const wchar_t *p1,const wchar_t *p2, size_t n)
b = *--p2;
return (short)a - b;
}
return 0;
break;
}
return 0;
}

5
sources/nix/string/wcstok.c
View File

@ -42,9 +42,10 @@ cont:
else
s[-1] = L'\0';
*lasts = s;
return (tok);
goto End;
}
} while (sc != L'\0');
}
/* NOTREACHED */
End:
return (tok);
}

2
sources/nix20/stdio/amistdio.c
View File

@ -1,5 +1,7 @@
#include "amistdio.h"
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <stabs.h>
#include <dos/dosextens.h>

2
sources/nix20/stdio/stat.c
View File

@ -20,7 +20,9 @@ extern void FreeDosObject(long, void *);
extern int __stat(struct stat *buf,struct FileInfoBlock *fib);
extern void __seterrno(void);
#ifdef IXPATHS
extern char *__amigapath(const char *path);
#endif
asm("_lstat: .global _lstat");
int stat(const char *name,struct stat *buf)

103
sources/socket/socket/addrinfo.c
View File

@ -1,14 +1,99 @@
#include "socket.h"
#define freeaddrinfo __freeaddrinfo
#define getaddrinfo __getaddrinfo
#define getnameinfo __getnameinfo
#define gai_strerror __gai_strerror
#include <proto/bsdsocket.h>
#undef freeaddrinfo
#undef getaddrinfo
#undef getnameinfo
#undef gai_strerror
#include <exec/libraries.h>
#define BSDSOCKET_BASE_NAME SocketBase
extern struct Library * SocketBase;
#define __freeaddrinfo(ai) ({ \
struct addrinfo * _freeaddrinfo_ai = (ai); \
{ \
register struct Library * const __freeaddrinfo__bn __asm("a6") = (struct Library *) (BSDSOCKET_BASE_NAME); register int _d1 __asm("d1"); register int _a0 __asm("a0"); register int _a1 __asm("a1");\
register struct addrinfo * __freeaddrinfo_ai __asm("a0") = (_freeaddrinfo_ai); \
__asm volatile ("jsr a6@(-804:W)" \
: \
: "r"(__freeaddrinfo__bn), "r"(__freeaddrinfo_ai) \
: "d0", "d1", "a1", "fp0", "fp1", "cc", "memory"); \
} \
})
#define __freeaddrinfo(ai) ({ \
struct addrinfo * _freeaddrinfo_ai = (ai); \
{ \
register struct Library * const __freeaddrinfo__bn __asm("a6") = (struct Library *) (BSDSOCKET_BASE_NAME); register int _d1 __asm("d1"); register int _a0 __asm("a0"); register int _a1 __asm("a1");\
register struct addrinfo * __freeaddrinfo_ai __asm("a0") = (_freeaddrinfo_ai); \
__asm volatile ("jsr a6@(-804:W)" \
: \
: "r"(__freeaddrinfo__bn), "r"(__freeaddrinfo_ai) \
: "d0", "d1", "a1", "fp0", "fp1", "cc", "memory"); \
} \
})
#define __getaddrinfo(hostname, servname, hints, res) ({ \
CONST_STRPTR _getaddrinfo_hostname = (hostname); \
CONST_STRPTR _getaddrinfo_servname = (servname); \
const struct addrinfo * _getaddrinfo_hints = (hints); \
struct addrinfo ** _getaddrinfo_res = (res); \
LONG _getaddrinfo__re = \
({ \
register struct Library * const __getaddrinfo__bn __asm("a6") = (struct Library *) (BSDSOCKET_BASE_NAME); register int _d1 __asm("d1"); register int _a0 __asm("a0"); register int _a1 __asm("a1");\
register LONG __getaddrinfo__re __asm("d0"); \
register CONST_STRPTR __getaddrinfo_hostname __asm("a0") = (_getaddrinfo_hostname); \
register CONST_STRPTR __getaddrinfo_servname __asm("a1") = (_getaddrinfo_servname); \
register const struct addrinfo * __getaddrinfo_hints __asm("a2") = (_getaddrinfo_hints); \
register struct addrinfo ** __getaddrinfo_res __asm("a3") = (_getaddrinfo_res); \
__asm volatile ("jsr a6@(-810:W)" \
: "=r" (_d1), "=r" (_a0), "=r" (_a1), "=r"(__getaddrinfo__re) \
: "r"(__getaddrinfo__bn), "r"(__getaddrinfo_hostname), "r"(__getaddrinfo_servname), "r"(__getaddrinfo_hints), "r"(__getaddrinfo_res) \
: "fp0", "fp1", "cc", "memory"); \
__getaddrinfo__re; \
}); \
_getaddrinfo__re; \
})
#define __getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) ({ \
const struct sockaddr * _getnameinfo_sa = (sa); \
ULONG _getnameinfo_salen = (salen); \
STRPTR _getnameinfo_host = (host); \
ULONG _getnameinfo_hostlen = (hostlen); \
STRPTR _getnameinfo_serv = (serv); \
ULONG _getnameinfo_servlen = (servlen); \
ULONG _getnameinfo_flags = (flags); \
LONG _getnameinfo__re = \
({ \
register struct Library * const __getnameinfo__bn __asm("a6") = (struct Library *) (BSDSOCKET_BASE_NAME); register int _d1 __asm("d1"); register int _a0 __asm("a0"); register int _a1 __asm("a1");\
register LONG __getnameinfo__re __asm("d0"); \
register const struct sockaddr * __getnameinfo_sa __asm("a0") = (_getnameinfo_sa); \
register ULONG __getnameinfo_salen __asm("d0") = (_getnameinfo_salen); \
register STRPTR __getnameinfo_host __asm("a1") = (_getnameinfo_host); \
register ULONG __getnameinfo_hostlen __asm("d1") = (_getnameinfo_hostlen); \
register STRPTR __getnameinfo_serv __asm("a2") = (_getnameinfo_serv); \
register ULONG __getnameinfo_servlen __asm("d2") = (_getnameinfo_servlen); \
register ULONG __getnameinfo_flags __asm("d3") = (_getnameinfo_flags); \
__asm volatile ("jsr a6@(-822:W)" \
: "=r" (_d1), "=r" (_a0), "=r" (_a1), "=r"(__getnameinfo__re) \
: "r"(__getnameinfo__bn), "r"(__getnameinfo_sa), "r"(__getnameinfo_salen), "r"(__getnameinfo_host), "r"(__getnameinfo_hostlen), "r"(__getnameinfo_serv), "r"(__getnameinfo_servlen), "r"(__getnameinfo_flags) \
: "fp0", "fp1", "cc", "memory"); \
__getnameinfo__re; \
}); \
_getnameinfo__re; \
})
#define __gai_strerror(errnum) ({ \
LONG _gai_strerror_errnum = (errnum); \
STRPTR _gai_strerror__re = \
({ \
register struct Library * const __gai_strerror__bn __asm("a6") = (struct Library *) (BSDSOCKET_BASE_NAME); register int _d1 __asm("d1"); register int _a0 __asm("a0"); register int _a1 __asm("a1");\
register STRPTR __gai_strerror__re __asm("d0"); \
register LONG __gai_strerror_errnum __asm("a0") = (_gai_strerror_errnum); \
__asm volatile ("jsr a6@(-816:W)" \
: "=r" (_d1), "=r" (_a0), "=r" (_a1), "=r"(__gai_strerror__re) \
: "r"(__gai_strerror__bn), "r"(__gai_strerror_errnum) \
: "fp0", "fp1", "cc", "memory"); \
__gai_strerror__re; \
}); \
_gai_strerror__re; \
})
void freeaddrinfo(struct addrinfo *ai) {
__freeaddrinfo(ai);

4
sources/socket/unistd/select.c
View File

@ -77,7 +77,7 @@ static inline int net_select(int s, fd_set *in, fd_set *out, fd_set *exc, struct
break;
case LX_AMITCP:
rc = TCP_WaitSelect(s, in, out, exc, timeout, sigs);
rc = TCP_WaitSelect(s, in, out, exc, timeout, (ULONG*)sigs);
break;
default:
@ -156,7 +156,7 @@ static inline int lx_select(int nfd, fd_set *ifd, fd_set *ofd, fd_set *efd, stru
wait_sigs = SIGBREAKF_CTRL_C | origmask;
if (cmd=SELCMD_POLL,skipped_wait) {
if ((cmd=SELCMD_POLL,skipped_wait) != 0) {
if (dotout) {
_treq->tr_node.io_Command = TR_ADDREQUEST;

2
sources/startup/libinit.c
View File

@ -142,7 +142,7 @@ static __inline APTR __GetBssStart(void)
__asm("lea __edata,%0" : "=a" (res)); return res;
}
#endif __BASEREL
#endif //__BASEREL
APTR
LibInit(REG(a0,LONG SegList),REG(d0,__LIB lib),REG(a6,struct Library *SysBase))