Commit1ed61b3

committed

Fix unportable assumptions about alignment of local char[n] variables.

1 parent39ceedf commit1ed61b3Copy full SHA for 1ed61b3

File tree

+14

-8

lines changed

+14

-8

lines changed

Lines changed: 14 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -227,23 +227,29 @@ SOCK_put_string(SocketClass self, char string)`
`227`	`227`	`int`
`228`	`228`	`SOCK_get_int(SocketClass*self,shortlen)`
`229`	`229`	`{`
`230`		`-charbuf[4];`
`231`		`-`
`232`	`230`	`switch (len)`
`233`	`231`	`{`
`234`	`232`	`case2:`
`235`		`-SOCK_get_n_char(self,buf,len);`
	`233`	`+{`
	`234`	`+unsigned shortbuf;`
	`235`	`+`
	`236`	`+SOCK_get_n_char(self, (char*)&buf,len);`
`236`	`237`	`if (self->reverse)`
`237`		`-return((unsigned short)buf);`
	`238`	`+returnbuf;`
`238`	`239`	`else`
`239`		`-returnntohs(((unsigned short)buf));`
	`240`	`+returnntohs(buf);`
	`241`	`+}`
`240`	`242`
`241`	`243`	`case4:`
`242`		`-SOCK_get_n_char(self,buf,len);`
	`244`	`+{`
	`245`	`+unsignedintbuf;`
	`246`	`+`
	`247`	`+SOCK_get_n_char(self, (char*)&buf,len);`
`243`	`248`	`if (self->reverse)`
`244`		`-return((unsignedint)buf);`
	`249`	`+returnbuf;`
`245`	`250`	`else`
`246`		`-returnntohl(((unsignedint)buf));`
	`251`	`+returnntohl(buf);`
	`252`	`+}`
`247`	`253`
`248`	`254`	`default:`
`249`	`255`	`self->errornumber=SOCKET_GET_INT_WRONG_LENGTH;`

Comments

(0)