1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
|
Index: include/rpc/xdr.h
===================================================================
RCS file: /cvs/linuxtv/dietlibc/include/rpc/xdr.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- include/rpc/xdr.h 26 Jun 2001 15:27:43 -0000 1.4
+++ include/rpc/xdr.h 21 Mar 2003 21:01:04 -0000 1.5
@@ -126,7 +126,7 @@
/* returns bytes off from beginning */
bool_t (*x_setpostn) (XDR *__xdrs, unsigned int __pos);
/* lets you reposition the stream */
- int32_t *(*x_inline) (XDR *__xdrs, int __len);
+ int32_t *(*x_inline) (XDR *__xdrs, unsigned int __len);
/* buf quick ptr to buffered data */
void (*x_destroy) (XDR *__xdrs);
/* free privates of this xdr_stream */
@@ -139,7 +139,7 @@
char* x_public; /* users' data */
char* x_private; /* pointer to private data */
char* x_base; /* private used for position info */
- int x_handy; /* extra private word */
+ unsigned int x_handy; /* extra private word */
};
/*
Index: librpc/xdr_mem.c
===================================================================
RCS file: /cvs/linuxtv/dietlibc/librpc/xdr_mem.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- librpc/xdr_mem.c 23 Feb 2002 23:08:21 -0000 1.5
+++ librpc/xdr_mem.c 21 Mar 2003 21:01:04 -0000 1.6
@@ -48,13 +48,13 @@
#include <netinet/in.h>
#include <string.h>
-static bool_t xdrmem_getlong();
-static bool_t xdrmem_putlong();
+static bool_t xdrmem_getlong(XDR*, long*);
+static bool_t xdrmem_putlong(XDR*, const long*);
static bool_t xdrmem_getbytes();
static bool_t xdrmem_putbytes();
static unsigned int xdrmem_getpos();
static bool_t xdrmem_setpos();
-static int32_t *xdrmem_inline();
+static int32_t *xdrmem_inline(XDR*, unsigned int);
static void xdrmem_destroy();
static struct xdr_ops xdrmem_ops = {
@@ -95,54 +95,41 @@
register XDR *xdrs;
long *lp;
{
+ if (xdrs->x_handy < 4) return FALSE;
+ xdrs->x_handy -= 4;
- if ((xdrs->x_handy -= sizeof(long)) < 0)
- return (FALSE);
-
- *lp = (long) ntohl((unsigned long) (*((long *) (xdrs->x_private))));
- xdrs->x_private += sizeof(long);
-
- return (TRUE);
+ *lp = (int32_t) ntohl((*((int32_t *) (xdrs->x_private))));
+ xdrs->x_private += 4;
+ return TRUE;
}
-static bool_t xdrmem_putlong(xdrs, lp)
-register XDR *xdrs;
-long *lp;
+static bool_t xdrmem_putlong(XDR* xdrs, const long* lp)
{
+ if (xdrs->x_handy < 4) return FALSE;
+ xdrs->x_handy -= 4;
- if ((xdrs->x_handy -= sizeof(long)) < 0)
- return (FALSE);
-
- *(long *) xdrs->x_private = (long) htonl((unsigned long) (*lp));
- xdrs->x_private += sizeof(long);
+ *(int32_t *) xdrs->x_private = htonl(*lp);
+ xdrs->x_private += sizeof(long);
- return (TRUE);
+ return (TRUE);
}
-static bool_t xdrmem_getbytes(xdrs, addr, len)
-register XDR *xdrs;
-char* addr;
-register unsigned int len;
+static bool_t xdrmem_getbytes(XDR* xdrs, char* addr, unsigned int len)
{
-
- if ((xdrs->x_handy -= len) < 0)
- return (FALSE);
- memmove(addr, xdrs->x_private, len);
- xdrs->x_private += len;
- return (TRUE);
+ if (xdrs->x_handy < len) return FALSE;
+ xdrs->x_handy -= len;
+ memmove(addr, xdrs->x_private, len);
+ xdrs->x_private += len;
+ return TRUE;
}
-static bool_t xdrmem_putbytes(xdrs, addr, len)
-register XDR *xdrs;
-char* addr;
-register unsigned int len;
+static bool_t xdrmem_putbytes(XDR* xdrs, char* addr, unsigned int len)
{
-
- if ((xdrs->x_handy -= len) < 0)
- return (FALSE);
- memmove(xdrs->x_private, addr, len);
- xdrs->x_private += len;
- return (TRUE);
+ if (xdrs->x_handy < len) return FALSE;
+ xdrs->x_handy -= len;
+ memmove(xdrs->x_private, addr, len);
+ xdrs->x_private += len;
+ return (TRUE);
}
static unsigned int xdrmem_getpos(xdrs)
@@ -156,19 +143,19 @@
register XDR *xdrs;
unsigned int pos;
{
- register char* newaddr = xdrs->x_base + pos;
- register char* lastaddr = xdrs->x_private + xdrs->x_handy;
+ register char* newaddr = xdrs->x_base + pos;
+ register char* lastaddr = xdrs->x_private + xdrs->x_handy;
- if ((long) newaddr > (long) lastaddr)
- return (FALSE);
- xdrs->x_private = newaddr;
- xdrs->x_handy = (int) lastaddr - (int) newaddr;
- return (TRUE);
+ if ((long) newaddr > (long) lastaddr || (long)newaddr<(long)xdrs->x_base)
+ return (FALSE);
+ xdrs->x_private = newaddr;
+ xdrs->x_handy = (int) lastaddr - (int) newaddr;
+ return (TRUE);
}
static int32_t *xdrmem_inline(xdrs, len)
register XDR *xdrs;
-int len;
+unsigned int len;
{
int32_t *buf = 0;
Index: librpc/xdr_rec.c
===================================================================
RCS file: /cvs/linuxtv/dietlibc/librpc/xdr_rec.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- librpc/xdr_rec.c 23 Feb 2002 23:08:21 -0000 1.6
+++ librpc/xdr_rec.c 21 Mar 2003 21:01:04 -0000 1.7
@@ -459,9 +459,7 @@
return (FALSE);
}
-static int32_t *xdrrec_inline(xdrs, len)
-register XDR *xdrs;
-int len;
+static int32_t *xdrrec_inline(XDR* xdrs, unsigned int len)
{
register RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
int32_t *buf = NULL;
Index: librpc/xdr_stdio.c
===================================================================
RCS file: /cvs/linuxtv/dietlibc/librpc/xdr_stdio.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- librpc/xdr_stdio.c 23 Feb 2002 23:08:21 -0000 1.4
+++ librpc/xdr_stdio.c 21 Mar 2003 21:01:04 -0000 1.5
@@ -170,9 +170,7 @@
FALSE : TRUE);
}
-static int32_t *xdrstdio_inline(xdrs, len)
-XDR *xdrs;
-unsigned int len;
+static int32_t *xdrstdio_inline(XDR* xdrs, unsigned int len)
{
/*
|
GitWeb