Commit4c26d45

committed

Replace memcpy with memmove

1 parent887603d commit4c26d45Copy full SHA for 4c26d45

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ void ShubLoop(Shub* shub)`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`	`/* Move partly fetched message header (if any) to the beginning of buffer */`
`370`		`-memcpy(shub->out_buffer,shub->out_buffer+pos,available-pos);`
	`370`	`+memmove(shub->out_buffer,shub->out_buffer+pos,available-pos);`
`371`	`371`	`shub->out_buffer_used=available-pos;`
`372`	`372`	`}else {/* receive request from client */`
`373`	`373`	`intchan=i;`
`@@ -454,7 +454,7 @@ void ShubLoop(Shub* shub)`
`454`	`454`	`shub->params->error_handler("Failed to write to inet socket",SHUB_RECOVERABLE_ERROR);`
`455`	`455`	`reconnect(shub);`
`456`	`456`	`}`
`457`		`-memcpy(shub->in_buffer,shub->in_buffer+pos,available-=pos);`
	`457`	`+memmove(shub->in_buffer,shub->in_buffer+pos,available-=pos);`
`458`	`458`	`pos=0;`
`459`	`459`	`}else {`
`460`	`460`	`available-=pos;`

Lines changed: 1 addition & 1 deletion

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ int main(int argc, char* argv[])`
`93`	`93`	`if (msg->hdr.code==MSG_DISCONNECT) {`
`94`	`94`	`assert(msg->hdr.size==0);`
`95`	`95`	`printf("Disconnect client [%d:%d]\n",i,msg->hdr.chan);`
`96`		`-memcpy(buf+pos,buf+pos+sizeof(ShubMessageHdr),available-pos-sizeof(ShubMessageHdr));`
	`96`	`+memmove(buf+pos,buf+pos+sizeof(ShubMessageHdr),available-pos-sizeof(ShubMessageHdr));`
`97`	`97`	`available-=sizeof(ShubMessageHdr);`
`98`	`98`	`}else {`
`99`	`99`	`assert(sizeof(ShubMessageHdr)+msg->hdr.size==sizeof(Message));`

Comments

(0)