From daca85d1c0f38fc39a0827640dbd3ce45d07625e Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 13 Oct 2005 22:46:56 +0000
Subject: [PATCH] Use "protocol" instead of "service" for calls to
open_socket().
---
src/sbbs3/js_socket.c | 8 ++++----
src/sbbs3/sbbs.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/sbbs3/js_socket.c b/src/sbbs3/js_socket.c
index 4c0983ea75..b9815d3f00 100644
--- a/src/sbbs3/js_socket.c
+++ b/src/sbbs3/js_socket.c
@@ -1309,13 +1309,13 @@ js_socket_constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv
int32 type=SOCK_STREAM; /* default = TCP */
uintN i;
private_t* p;
- char* sock_service=NULL;
+ char* protocol=NULL;
for(i=0;i<argc;i++) {
if(JSVAL_IS_NUMBER(argv[i]))
JS_ValueToInt32(cx,argv[i],&type);
- else if(sock_service==NULL)
- sock_service=JS_GetStringBytes(JS_ValueToString(cx,argv[i]));
+ else if(protocol==NULL)
+ protocol=JS_GetStringBytes(JS_ValueToString(cx,argv[i]));
}
if((p=(private_t*)malloc(sizeof(private_t)))==NULL) {
@@ -1324,7 +1324,7 @@ js_socket_constructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv
}
memset(p,0,sizeof(private_t));
- if((p->sock=open_socket(type,sock_service))==INVALID_SOCKET) {
+ if((p->sock=open_socket(type,protocol))==INVALID_SOCKET) {
JS_ReportError(cx,"open_socket failed with error %d",ERROR_VALUE);
return(JS_FALSE);
}
diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h
index 558b877fa5..80dc8ef8fc 100644
--- a/src/sbbs3/sbbs.h
+++ b/src/sbbs3/sbbs.h
@@ -1046,7 +1046,7 @@ BOOL md(char *path);
int lputs(int level, char *); /* log output */
int lprintf(int level, char *fmt, ...); /* log output */
int eprintf(int level, char *fmt, ...); /* event log */
- SOCKET open_socket(int type, const char* service);
+ SOCKET open_socket(int type, const char* protocol);
SOCKET accept_socket(SOCKET s, SOCKADDR* addr, socklen_t* addrlen);
int close_socket(SOCKET);
u_long resolve_ip(char *addr);
--
GitLab