Преглед на файлове

update using sprints function

OlehKulykov преди 9 години
родител
ревизия
1528ca28f0

+ 7 - 7
src/rws_socketpriv.c

@@ -345,25 +345,25 @@ void rws_socket_send_handshake(_rws_socket * s)
 	char buff[512];
 	char buff[512];
 	char * ptr = buff;
 	char * ptr = buff;
 	size_t writed = 0;
 	size_t writed = 0;
-	writed = rws_sprintf(ptr, 512, "GET %s HTTP/%s\r\n", s->path, k_rws_socket_min_http_ver); ptr += writed;
+	writed = rws_sprintf(ptr, 512, "GET %s HTTP/%s\r\n", s->path, k_rws_socket_min_http_ver);
 
 
 //	ptr += sprintf(ptr, "Host: %s\r\n", s->host);
 //	ptr += sprintf(ptr, "Host: %s\r\n", s->host);
 
 
-	if (s->port == 80) { writed += rws_sprintf(ptr, 512 - writed, "Host: %s\r\n", s->host); ptr += writed; }
-	else { writed += rws_sprintf(ptr, 512 - writed, "Host: %s:%i\r\n", s->host, s->port); ptr += writed; }
+	if (s->port == 80) writed += rws_sprintf(ptr + writed, 512 - writed, "Host: %s\r\n", s->host);
+	else writed += rws_sprintf(ptr + writed, 512 - writed, "Host: %s:%i\r\n", s->host, s->port);
 
 
-	writed += rws_sprintf(ptr, 512 - writed,
+	writed += rws_sprintf(ptr + writed, 512 - writed,
 						  "Upgrade: websocket\r\n"
 						  "Upgrade: websocket\r\n"
 						  "Connection: Upgrade\r\n"
 						  "Connection: Upgrade\r\n"
 						  "Origin: %s://%s\r\n",
 						  "Origin: %s://%s\r\n",
-						  s->scheme, s->host); ptr += writed;
+						  s->scheme, s->host);
 
 
-	writed += rws_sprintf(ptr, 512 - writed,
+	writed += rws_sprintf(ptr + writed, 512 - writed,
 						  "Sec-WebSocket-Key: %s\r\n"
 						  "Sec-WebSocket-Key: %s\r\n"
 						  "Sec-WebSocket-Protocol: chat, superchat\r\n"
 						  "Sec-WebSocket-Protocol: chat, superchat\r\n"
 						  "Sec-WebSocket-Version: 13\r\n"
 						  "Sec-WebSocket-Version: 13\r\n"
 						  "\r\n",
 						  "\r\n",
-						  "dGhlIHNhbXBsZSBub25jZQ=="); ptr += writed;
+						  "dGhlIHNhbXBsZSBub25jZQ==");
 
 
 	if (rws_socket_send(s, buff, writed))
 	if (rws_socket_send(s, buff, writed))
 	{
 	{

BIN
test/librws_test.xcodeproj/project.xcworkspace/xcuserdata/residentevil.xcuserdatad/UserInterfaceState.xcuserstate


+ 18 - 0
test/librws_test.xcodeproj/xcuserdata/residentevil.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,4 +2,22 @@
 <Bucket
 <Bucket
    type = "1"
    type = "1"
    version = "2.0">
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "../src/rws_socketpriv.c"
+            timestampString = "479166769.510243"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "111"
+            endingLineNumber = "111"
+            landmarkName = "rws_socket_process_handshake_responce()"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
 </Bucket>