PuTTy: Diff

Differences From Artifact [12049fa328]:

File ssh.c — part of check-in [28f44ea3f8] at 2002-10-30 11:57:31 on branch trunk — More preparatory work: remove the <windows.h> include from lots of source files in which it's no longer required (it was previously required in anything that included <putty.h>, but not any more). Also moved a couple of stray bits of exposed WinSock back into winnet.c (getservbyname from ssh.c and AF_INET from proxy.c). (user: simon size: 184451)

File ssh.c — part of check-in [811ba17fbe] at 2002-11-01 06:53:10 on branch trunk — Pass int rather than char to va_arg (the latter gets promoted). (user: simon size: 184456)

︙			︙
1249 1250 1251 1252 1253 1254 1255 ~~1256~~ 1257 1258 1259 1260 1261 1262 1263	while ((argtype = va_arg(ap1, int)) != PKT_END) { switch (argtype) { case PKT_INT: (void) va_arg(ap1, int); pktlen += 4; break; case PKT_CHAR: ~~(void) va_arg(ap1, ~~char~~);~~ pktlen++; break; case PKT_DATA: (void) va_arg(ap1, unsigned char *); arglen = va_arg(ap1, int); pktlen += arglen; break;	\|	1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263	while ((argtype = va_arg(ap1, int)) != PKT_END) { switch (argtype) { case PKT_INT: (void) va_arg(ap1, int); pktlen += 4; break; case PKT_CHAR: (void) va_arg(ap1, int); pktlen++; break; case PKT_DATA: (void) va_arg(ap1, unsigned char *); arglen = va_arg(ap1, int); pktlen += arglen; break;
︙			︙
1282 1283 1284 1285 1286 1287 1288 ~~1289~~ 1290 1291 1292 1293 1294 1295 1296	switch (argtype) { case PKT_INT: argint = va_arg(ap2, int); PUT_32BIT(p, argint); p += 4; break; case PKT_CHAR: ~~argchar = ~~va_arg(ap2,~~ unsigned char);~~ p = argchar; p++; break; case PKT_DATA: argp = va_arg(ap2, unsigned char ); arglen = va_arg(ap2, int); memcpy(p, argp, arglen);	\|	1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296	switch (argtype) { case PKT_INT: argint = va_arg(ap2, int); PUT_32BIT(p, argint); p += 4; break; case PKT_CHAR: argchar = (unsigned char) va_arg(ap2, int); p = argchar; p++; break; case PKT_DATA: argp = va_arg(ap2, unsigned char ); arglen = va_arg(ap2, int); memcpy(p, argp, arglen);
︙			︙