Changeset 152
- Timestamp:
- 08/05/09 12:31:45 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/merlin/src/simples.c
r151 r152 33 33 } 34 34 35 char *trim(txt) 36 char *txt; 35 char *trim(char *txt) 37 36 { 38 37 register int l; … … 142 141 } 143 142 144 int key_atob14(char *asc, uchar * 143 int key_atob14(char *asc, uchar *bin) 145 144 { 146 145 int i, n1, n2, rc; … … 156 155 } 157 156 158 char *key_btoa(char *asc, uchar * 157 char *key_btoa(char *asc, uchar *bin) 159 158 { 160 159 int i; //, n1, n2, rc; … … 168 167 } 169 168 170 char *cs_hexdump(int m, uchar * 169 char *cs_hexdump(int m, uchar *buf, int n) 171 170 { 172 171 int i; … … 200 199 { 201 200 struct in_addr in; 202 203 201 in.s_addr = cs_inet_order(n); 204 202 return ((char *) inet_ntoa(in)); … … 222 220 } 223 221 224 ulong b2i(int n, uchar * 222 ulong b2i(int n, uchar *b) 225 223 { 226 224 switch (n) { … … 234 232 } 235 233 236 ullong b2ll(int n, uchar * 234 ullong b2ll(int n, uchar *b) 237 235 { 238 236 int i; … … 241 239 for (i = 0; i < n; k += b[i++]) 242 240 k <<= 8; 243 return (k);241 return k; 244 242 } 245 243 … … 264 262 break; 265 263 } 266 return (b);264 return b; 267 265 } 268 266 … … 284 282 rc |= (0xf << (i << 2)); 285 283 errno = 0; 286 return (rc);284 return rc; 287 285 } 288 286
Note:
See TracChangeset
for help on using the changeset viewer.