Skip to content

Commit ae284c4

Browse files
ROOLTimothyEBaldwin
ROOL
authored andcommitted
Internet: Preemptive casts ahead of header changes
Detail: The iov_base will be changing from char to void pointer in future, preemptively insert a cast in 'kern_subr.c' to prevent compiler errors. Move svcdebug.h here from TCPIPLibs since its only (private) implementation is this component, and remove unused includes of 'ioc.h' and 'int_hndlr.h'. Admin: Submission for TCP/IP bounty. Version 5.65. Not tagged
1 parent 03fa80a commit ae284c4

File tree

5 files changed

+51
-12
lines changed

5 files changed

+51
-12
lines changed
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
/* (5.65)
22
*
33
* This file is automatically maintained by srccommit, do not edit manually.
4-
* Last processed by srccommit version: 1.1.
54
*
65
*/
76
#define Module_MajorVersion_CMHG 5.65
8-
#define Module_MinorVersion_CMHG
9-
#define Module_Date_CMHG 15 Sep 2018
7+
#define Module_MinorVersion_CMHG
8+
#define Module_Date_CMHG 05 Nov 2022
109

1110
#define Module_MajorVersion "5.65"
1211
#define Module_Version 565
1312
#define Module_MinorVersion ""
14-
#define Module_Date "15 Sep 2018"
13+
#define Module_Date "05 Nov 2022"
1514

16-
#define Module_ApplicationDate "15-Sep-18"
15+
#define Module_ApplicationDate "05-Nov-22"
1716

1817
#define Module_ComponentName "Internet"
19-
#define Module_ComponentPath "mixed/RiscOS/Sources/Networking/AUN/Internet"
2018

2119
#define Module_FullVersion "5.65"
22-
#define Module_HelpVersion "5.65 (15 Sep 2018)"
20+
#define Module_HelpVersion "5.65 (05 Nov 2022)"
2321
#define Module_LibraryVersionInfo "5:65"
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/* Copyright 1995 Acorn Computers Ltd
2+
*
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
6+
*
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
/* -*-C-*-
16+
*
17+
* svcdebug.h - minimal debug support using SVC printf routines
18+
*
19+
* Copyright (c) 1995 Acorn Computers Ltd., Cambridge, England
20+
*
21+
* :RCS Log discontinued:
22+
* Revision 1.1 95/01/11 10:21:40 kwelton
23+
* Initial revision
24+
*
25+
*/
26+
27+
#ifdef DEBUG
28+
extern int debug;
29+
#else
30+
# define debug 0
31+
#endif
32+
33+
extern void Printf(const char *format, ...);
34+
35+
#define PRINTF if (debug) Printf
36+
#define N(x) (x ? x : "NULL")
37+
38+
/*
39+
* trigger level for "super debugs"
40+
*/
41+
extern int superdebug;
42+
#define SDBTRIGGER 16
43+
44+
/* EOF svcdebug.h */

RiscOS/Sources/Networking/AUN/Internet/kern/c/kern_subr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ uiomove(cp, n, uio)
105105
break;
106106
}
107107
#endif
108-
iov->iov_base += cnt;
108+
iov->iov_base = (char *)iov->iov_base + cnt;
109109
iov->iov_len -= cnt;
110110
uio->uio_resid -= cnt;
111111
uio->uio_offset += cnt;
@@ -199,7 +199,7 @@ again:
199199
}
200200
if (c < 0)
201201
return (-1);
202-
iov->iov_base++;
202+
iov->iov_base = (char *)iov->iov_base + 1;
203203
iov->iov_len--;
204204
uio->uio_resid--;
205205
uio->uio_offset++;

RiscOS/Sources/Networking/AUN/Internet/riscos/c/module

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "AsmUtils/callbacks.h"
2929
#include "Global/Services.h"
3030
#include "Global/NewErrors.h"
31-
#include "int_hndlr.h"
3231

3332
#include "sys/param.h"
3433
#include "sys/errno.h"

RiscOS/Sources/Networking/AUN/Internet/riscos/c/setsoft

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
*/
2121

2222
#include "kernel.h"
23-
#include "ioc.h"
24-
#include "int_hndlr.h"
2523

2624
#include "sys/param.h"
2725
#include "sys/socket.h"

0 commit comments

Comments
 (0)