Skip to content

Remove ToMem macro. #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 23, 2020
Merged

Remove ToMem macro. #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions src/inet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,6 @@
#include "inlnPS2.h"
#endif

#ifdef OS5
#define ToMem memmove
#else
#define ToMem memcpy
#endif /* !OS5 */

#define TCPhostlookup 0
#define TCPservicelookup 1
#define TCPsocket 2
Expand Down Expand Up @@ -126,7 +120,7 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li
LispStringToCString(nameConn, namestring, 100);
host = gethostbyname(namestring);
if (!host) return (NIL);
ToMem((char *)&farend.sin_addr, (char *)host->h_addr, host->h_length);
memcpy((char *)&farend.sin_addr, (char *)host->h_addr, host->h_length);
host_ok:
sock = LispNumToCInt(proto);
result = socket(AF_INET, SOCK_STREAM, 0);
Expand Down
8 changes: 1 addition & 7 deletions src/rpc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@
#define MAX_HOSTNAME_LENGTH 100
#define UDP_DATA_BLOCK_SIZE 1000

#ifdef OS5
#define ToMem memmove
#else
#define ToMem memcpy
#endif /* OS5 */

LispPTR rpc(LispPTR *args)
{
#ifndef DOS
Expand Down Expand Up @@ -130,7 +124,7 @@ LispPTR rpc(LispPTR *args)
/* Resolve the host address. */
if (hp) {
sin1.sin_family = hp->h_addrtype;
ToMem((caddr_t)&sin1.sin_addr, hp->h_addr, hp->h_length);
memcpy((caddr_t)&sin1.sin_addr, hp->h_addr, hp->h_length);
} else
goto handle_error;

Expand Down