Browse Source

* Fix warnings, hints and notes

Michaël Van Canneyt 10 months ago
parent
commit
083ac5c114

+ 17 - 17
packages/wasm-utils/src/wasm.websocket.api.pas

@@ -112,34 +112,32 @@ end;
 Function __wasm_websocket_allocate_buffer(aWebsocketID : TWasmWebSocketID; aUserData : Pointer; aBufferLen : Longint) : Pointer;
 
 begin
+    // Silence compiler warning
+  if (aWebSocketID=0) or (aUserData=Nil) then ;
   Result:=GetMem(aBufferLen);
 end;
 
 procedure LogError(const aOperation : String; aError : Exception);
 
 begin
-  __wasmwebsocket_log(wllError,SafeFormat('Error %s during %s callback: %s',[aError.ClassName,aError.Message]));
+  __wasmwebsocket_log(wllError,SafeFormat('Error %s during %s callback: %s',[aError.ClassName,aOperation,aError.Message]));
 end;
 
 Function __wasm_websocket_on_error (aWebsocketID : TWasmWebSocketID; aUserData : Pointer) : TWebsocketCallBackResult;
 
-var
-  lErr : String;
-  Buf : TBytes;
-
 begin
-    if not assigned(WebSocketErrorCallback) then
-      Exit(WASMWS_CALLBACK_NOHANDLER);
-    try
-      WebsocketErrorCallBack(aWebsocketID,aUserData);
-      Result:=WASMWS_CALLBACK_SUCCESS;
-    except
-      On E : exception do
-        begin
-        LogError('error',E);
-        Result:=WASMWS_CALLBACK_ERROR;
-        end;
-    end;
+  if not assigned(WebSocketErrorCallback) then
+    Exit(WASMWS_CALLBACK_NOHANDLER);
+  try
+    WebsocketErrorCallBack(aWebsocketID,aUserData);
+    Result:=WASMWS_CALLBACK_SUCCESS;
+  except
+    On E : exception do
+      begin
+      LogError('error',E);
+      Result:=WASMWS_CALLBACK_ERROR;
+      end;
+  end;
 end;
 
 Function __wasm_websocket_on_message (aWebsocketID : TWasmWebSocketID; aUserData : Pointer; aMessageType : TWasmWebSocketMessageType; aMessage : Pointer; aMessageLen : Integer) : TWebsocketCallBackResult;
@@ -148,6 +146,7 @@ var
   Buf : TBytes;
 
 begin
+  Buf:=[];
   try
     if not assigned(WebSocketMessageCallback) then
       Exit(WASMWS_CALLBACK_NOHANDLER);
@@ -194,6 +193,7 @@ var
   lClean : Boolean;
 
 begin
+  Buf:=[];
   try
     if not assigned(WebSocketCloseCallback) then
       Exit(WASMWS_CALLBACK_NOHANDLER);

+ 1 - 1
packages/wasm-utils/src/wasm.websocket.objects.pas

@@ -243,7 +243,6 @@ end;
 procedure TWasmWebsocket.SendMessage(const aString: String);
 
 var
-  Res : TWasmWebsocketResult;
   Buf : TBytes;
 
 begin
@@ -271,6 +270,7 @@ begin
     if C=Nil then C:=TWasmWebSocketManager;
     _instance:=TWasmWebSocketManager.Create;
     end;
+  Result:=_instance;
 end;