Add Objective-C nullability & update code formatting

contrib/objc/RWSSocketObjc.m

@@ -47,7 +47,9 @@
 	
 	id<RWSSocketObjcDelegate> d = self.delegate;
 	if (d && [d respondsToSelector:@selector(onRWSSocketDisconnected:withError:)]) {
-		dispatch_async(dispatch_get_main_queue(), ^{ [d onRWSSocketDisconnected:self withError:err]; });
+		dispatch_async(dispatch_get_main_queue(), ^{
+			[d onRWSSocketDisconnected:self withError:err];
+		});
 	}
 }
 
@@ -55,7 +57,9 @@ static void onRWSSocketObjcConnected(rws_socket socket) {
 	RWSSocketObjc * s = (__bridge RWSSocketObjc *)rws_socket_get_user_object(socket);
 	id<RWSSocketObjcDelegate> d = s ? [s delegate] : nil;
 	if (d && [d respondsToSelector:@selector(onRWSSocketConnected:)]) {
-		dispatch_async(dispatch_get_main_queue(), ^{ [d onRWSSocketConnected:s]; });
+		dispatch_async(dispatch_get_main_queue(), ^{
+			[d onRWSSocketConnected:s];
+		});
 	}
 }
 
@@ -71,7 +75,9 @@ static void onRWSSocketObjcRecvdText(rws_socket socket, const char * text, const
 	id<RWSSocketObjcDelegate> d = s ? [s delegate] : nil;
 	if (text && length && d && [d respondsToSelector:@selector(onRWSSocket:receivedText:)]) {
 		NSString * t = [NSString stringWithUTF8String:text];
-		dispatch_async(dispatch_get_main_queue(), ^{ [d onRWSSocket:s receivedText:t]; });
+		dispatch_async(dispatch_get_main_queue(), ^{
+			[d onRWSSocket:s receivedText:t];
+		});
 	}
 }
 
@@ -80,7 +86,9 @@ static void onRWSSocketObjcRecvdBin(rws_socket socket, const void * data, const
 	id<RWSSocketObjcDelegate> d = s ? [s delegate] : nil;
 	if (data && length && d && [d respondsToSelector:@selector(onRWSSocket:receivedData:)]) {
 		NSData * dt = [NSData dataWithBytes:data length:length];
-		dispatch_async(dispatch_get_main_queue(), ^{ [d onRWSSocket:s receivedData:dt]; });
+		dispatch_async(dispatch_get_main_queue(), ^{
+			[d onRWSSocket:s receivedData:dt];
+		});
 	}
 }
 

src/rws_error.c

@@ -29,8 +29,7 @@
 
 // private
 _rws_error * rws_error_create(void) {
-	_rws_error * e = (_rws_error *)rws_malloc_zero(sizeof(_rws_error));
-	return e;
+	return (_rws_error *)rws_malloc_zero(sizeof(_rws_error));
 }
 
 _rws_error * rws_error_new_code_descr(const int code, const char * description) {

src/rws_frame.c

@@ -227,7 +227,6 @@ size_t rws_check_recv_frame_size( const void *data ,const size_t data_size) {
 		
 		unsigned int expected_size = 0;
 		
-		
 		switch (payload) {
 			case 126: header_size += 2; break;
 			case 127: header_size += 8; break;

src/rws_list.c

@@ -47,7 +47,9 @@ void rws_list_delete_clean(_rws_list ** list) {
 void rws_list_append(_rws_list * list, _rws_node_value value) {
 	if (list) {
 		_rws_list * cur = list;
-		while (cur->next) cur = cur->next;
+		while (cur->next) {
+			cur = cur->next;
+		}
 		cur->next = (_rws_node *)rws_malloc_zero(sizeof(_rws_node));
 		cur->next->value = value;
 	}

src/rws_socketpriv.c

@@ -114,7 +114,9 @@ rws_bool rws_socket_process_handshake_responce(_rws_socket * s) {
 
 	rws_error_delete_clean(&s->error);
 	sub = strstr(str, "HTTP/");
-	if (!sub) return rws_false;
+	if (!sub) {
+		return rws_false;
+	}
 	
 	sub += 5;
 	if (rws_sscanf(sub, "%f %i", &http_ver, &http_code) != 2) {
@@ -172,14 +174,14 @@ rws_bool rws_socket_recv(_rws_socket * s) {
 	while (is_reading) {
 		len = (int)recv(s->socket, buff, 8192, 0);
 #if defined(RWS_OS_WINDOWS)
-        error_number = WSAGetLastError();
+		error_number = WSAGetLastError();
 #else
-        error_number = errno;
+		error_number = errno;
 #endif
 		if (len > 0) {
 			total_len += len;
-			if (s->received_size-s->received_len < len) {
-				rws_socket_resize_received(s, s->received_size+len);
+			if (s->received_size - s->received_len < len) {
+				rws_socket_resize_received(s, s->received_size + len);
 			}
 			received = (char *)s->received;
 			if (s->received_len) {
@@ -208,7 +210,9 @@ _rws_frame * rws_socket_last_unfin_recvd_frame_by_opcode(_rws_socket * s, const
 		frame = (_rws_frame *)cur->value.object;
 		if (frame) {
             //  [FIN=0,opcode !=0 ],[FIN=0,opcode ==0 ],....[FIN=1,opcode ==0 ]
-			if (!frame->is_finished /*&& frame->opcode == opcode*/) last = frame;
+			if (!frame->is_finished /*&& frame->opcode == opcode*/) {
+				last = frame;
+			}
 		}
 		cur = cur->next;
 	}
@@ -299,7 +303,9 @@ void rws_socket_idle_send(_rws_socket * s) {
 		while (cur && s->is_connected && sending) {
 			frame = (_rws_frame *)cur->value.object;
 			cur->value.object = NULL;
-			if (frame) sending = rws_socket_send(s, frame->data, frame->data_size);
+			if (frame) {
+				sending = rws_socket_send(s, frame->data, frame->data_size);
+			}
 			rws_frame_delete(frame);
 			cur = cur->next;
 		}
@@ -356,10 +362,11 @@ void rws_socket_send_handshake(_rws_socket * s) {
 	size_t writed = 0;
 	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);
-
-	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);
+	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 + writed, 512 - writed,
 						  "Upgrade: websocket\r\n"
@@ -571,7 +578,9 @@ rws_bool rws_socket_create_start_work_thread(_rws_socket * s) {
 void rws_socket_resize_received(_rws_socket * s, const size_t size) {
 	void * res = NULL;
 	size_t min = 0;
-	if (size == s->received_size) return;
+	if (size == s->received_size) {
+		return;
+	}
 
 	res = rws_malloc(size);
 	assert(res && (size > 0));

src/rws_socketpub.c

@@ -91,19 +91,18 @@ void rws_socket_disconnect_and_release(rws_socket socket) {
 rws_bool rws_socket_send_text(rws_socket socket, const char * text) {
 	_rws_socket * s = (_rws_socket *)socket;
 	rws_bool r = rws_false;
-	if (!s) {
-		return r;
+	if (s) {
+		rws_mutex_lock(s->send_mutex);
+		r = rws_socket_send_text_priv(s, text);
+		rws_mutex_unlock(s->send_mutex);
 	}
-	
-	rws_mutex_lock(s->send_mutex);
-	r = rws_socket_send_text_priv(s, text);
-	rws_mutex_unlock(s->send_mutex);
 	return r;
 }
 
 #if !defined(RWS_OS_WINDOWS)
 void rws_socket_handle_sigpipe(int signal_number) {
 	printf("\nlibrws handle sigpipe %i", signal_number);
+	(void)signal_number;
 	return;
 }
 #endif
@@ -113,6 +112,7 @@ void rws_socket_handle_sigpipe(int signal_number) {
 
 void rws_socket_check_info(const char * info) {
 	assert(info);
+	(void)info;
 }
 
 rws_socket rws_socket_create(void) {
@@ -178,27 +178,26 @@ void rws_socket_set_url(rws_socket socket,
 						const int port,
 						const char * path) {
 	_rws_socket * s = (_rws_socket *)socket;
-	if (!s) {
-		return;
+	if (s) {
+		rws_string_delete(s->scheme);
+		s->scheme = rws_string_copy(scheme);
+		
+		rws_string_delete(s->host);
+		s->host = rws_string_copy(host);
+		
+		rws_string_delete(s->path);
+		s->path = rws_string_copy(path);
+		
+		s->port = port;
 	}
-	
-	rws_string_delete(s->scheme);
-	s->scheme = rws_string_copy(scheme);
-	rws_string_delete(s->host);
-	s->host = rws_string_copy(host);
-	rws_string_delete(s->path);
-	s->path = rws_string_copy(path);
-	s->port = port;
 }
 
 void rws_socket_set_scheme(rws_socket socket, const char * scheme) {
 	_rws_socket * s = (_rws_socket *)socket;
-	if (!s) {
-		return;
+	if (s) {
+		rws_string_delete(s->scheme);
+		s->scheme = rws_string_copy(scheme);
 	}
-	
-	rws_string_delete(s->scheme);
-	s->scheme = rws_string_copy(scheme);
 }
 
 const char * rws_socket_get_scheme(rws_socket socket) {
@@ -208,12 +207,10 @@ const char * rws_socket_get_scheme(rws_socket socket) {
 
 void rws_socket_set_host(rws_socket socket, const char * host) {
 	_rws_socket * s = (_rws_socket *)socket;
-	if (!s) {
-		return;
+	if (s) {
+		rws_string_delete(s->host);
+		s->host = rws_string_copy(host);
 	}
-	
-	rws_string_delete(s->host);
-	s->host = rws_string_copy(host);
 }
 
 const char * rws_socket_get_host(rws_socket socket) {
@@ -223,12 +220,10 @@ const char * rws_socket_get_host(rws_socket socket) {
 
 void rws_socket_set_path(rws_socket socket, const char * path) {
 	_rws_socket * s = (_rws_socket *)socket;
-	if (!s) {
-		return;
+	if (s) {
+		rws_string_delete(s->path);
+		s->path = rws_string_copy(path);
 	}
-	
-	rws_string_delete(s->path);
-	s->path = rws_string_copy(path);
 }
 
 const char * rws_socket_get_path(rws_socket socket) {
@@ -325,13 +320,11 @@ void rws_socket_set_on_received_bin(rws_socket socket, rws_on_socket_recvd_bin c
 rws_bool rws_socket_is_connected(rws_socket socket) {
 	_rws_socket * s = (_rws_socket *)socket;
 	rws_bool r = rws_false;
-	if (!s) {
-		return r;
+	if (s) {
+		rws_mutex_lock(s->send_mutex);
+		r = s->is_connected;
+		rws_mutex_unlock(s->send_mutex);
 	}
-	
-	rws_mutex_lock(s->send_mutex);
-	r = s->is_connected;
-	rws_mutex_unlock(s->send_mutex);
 	return r;
 }
 

src/rws_thread.c

@@ -66,10 +66,16 @@ static void rws_threads_joiner_clean(void) { // private
 
 #if defined(RWS_OS_WINDOWS)
 	do {
-		if (GetExitCodeThread(t->thread, &dwExitCode) == 0) break; // fail
+		if (GetExitCodeThread(t->thread, &dwExitCode) == 0) {
+			break; // fail
+		}
 	} while (dwExitCode == STILL_ACTIVE);
-	if (dwExitCode == STILL_ACTIVE) TerminateThread(t->thread, 0);
-	if (CloseHandle(t->thread)) t->thread = NULL;
+	if (dwExitCode == STILL_ACTIVE) {
+		TerminateThread(t->thread, 0);
+	}
+	if (CloseHandle(t->thread)) {
+		t->thread = NULL;
+	}
 #else
 	pthread_join(t->thread, &r);
 	assert(r == NULL);
@@ -115,7 +121,9 @@ rws_thread rws_thread_create(rws_thread_funct thread_function, void * user_objec
 	pthread_attr_t attr;
 #endif
 
-	if (!thread_function) return NULL;
+	if (!thread_function) {
+		return NULL;
+	}
 	rws_threads_joiner_create_ifneed();
 	t = (_rws_thread *)rws_malloc_zero(sizeof(_rws_thread));
 	t->user_object = user_object;