Apply patch: ncpfs-hg-commit-441.patch

This commit is contained in:
Mario Fetka
2026-04-28 20:56:04 +02:00
parent acef0daea1
commit 783da0a9d7
27 changed files with 1119 additions and 142 deletions

View File

@@ -665,7 +665,7 @@ static void run_wdog(struct ncp_conn *conn, int fd) {
default:
if (pfd[0].revents & POLLIN) {
struct sockaddr_ipx sender;
int sizeofaddr = sizeof(struct sockaddr_ipx);
socklen_t sizeofaddr = sizeof(struct sockaddr_ipx);
unsigned char buf[1024];
size_t pktsize;
NWCCODE err;
@@ -1016,7 +1016,7 @@ do_ncp_tcp_call(struct ncp_conn *conn, unsigned int cmd, unsigned int task, cons
return ECONNABORTED;
}
if (ln > sizeof(conn->packet) - 2) {
fprintf(stderr, "Too long reply: %u\n", ln);
fprintf(stderr, "Too long reply: %zu\n", ln);
return ECONNABORTED;
}
result = do_tcp_rcv(conn->ncp_sock, conn->packet + 2, ln);

View File

@@ -714,7 +714,7 @@ NWDSCCODE NWCXAttachToTreeByName( NWCONN_HANDLE* conn, const NWDSChar * treeName
/* try to speed up search of all servers but first checking that treeName exists */
{
nuint32 scanIndex=-1;
nint32 scanIndex=-1;
char myTreeName [MAX_DN_CHARS+1];
NWDSContextHandle ctx;
int found=0;
@@ -856,7 +856,7 @@ static NWDSCCODE __docopy_string (UNUSED(NWDSContextHandle ctx), const void* val
case SYN_FAX_NUMBER:{
const Fax_Number_T* fn = (const Fax_Number_T*)val;
l = snprintf(result, maxSize, "%s,%u", fn->telephoneNumber, fn->parameters.numOfBits);
l = snprintf(result, maxSize, "%s,%zu", fn->telephoneNumber, fn->parameters.numOfBits);
}
break;
case SYN_EMAIL_ADDRESS:{
@@ -923,7 +923,7 @@ static NWDSCCODE __docopy_string (UNUSED(NWDSContextHandle ctx), const void* val
if (20 + (ol->length+1)*3+1 >=maxSize)
return NWE_BUFFER_OVERFLOW;
sprintf(result, "%u", ol->length);
sprintf(result, "%zu", ol->length);
aux = result + strlen(result);
for (i = 0; i < ol->length; i++) {
sprintf(aux, ",%02X", ol->data[i]);
@@ -940,7 +940,7 @@ static NWDSCCODE __docopy_string (UNUSED(NWDSContextHandle ctx), const void* val
#endif
if (20 + (os->length+1)*3+1 >=maxSize)
return NWE_BUFFER_OVERFLOW;
sprintf(result, "%u", os->length);
sprintf(result, "%zu", os->length);
aux = result + strlen(result);
for (i = 0; i < os->length; i++) {
sprintf(aux, ",%02X", os->data[i]);
@@ -956,7 +956,7 @@ static NWDSCCODE __docopy_string (UNUSED(NWDSContextHandle ctx), const void* val
z=na->addressLength;
if (40 + 3*(z+2)+1 >=maxSize)
return NWE_BUFFER_OVERFLOW;
sprintf(result, "%u,%u", na->addressType, na->addressLength);
sprintf(result, "%u,%zu", na->addressType, na->addressLength);
aux = result + strlen(result);
for (z = 0; z < na->addressLength; z++) {
sprintf(aux, ",%02X", na->address[z]);