hypr_ipc: fix use of unitialized variable

LBCrion · Aug 21, 2024 · d622883 · d622883
1 parent 25b06e2
commit d622883
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/src/hypr_ipc.c b/src/hypr_ipc.c
@@ -302,42 +302,39 @@ static void hypr_ipc_window_place ( gpointer wid )
 
 static void hypr_ipc_pager_populate( void )
 {
-  json_object *json,*ptr, *iter;
+  json_object *json, *ptr, *iter;
   gint i, wid;
   workspace_t *ws;
 
-  if(!hypr_ipc_request(ipc_sockaddr,"j/workspaces",&json) || !json)
+  if(!hypr_ipc_request(ipc_sockaddr, "j/workspaces", &json) || !json)
     return;
   if(json_object_is_type(json, json_type_array))
-    for(i=0;i<json_object_array_length(json);i++)
+    for(i=0; i<json_object_array_length(json); i++)
     {
-      ptr = json_object_array_get_idx(json,i);
-      wid = json_int_by_name(ptr,"id",-1);
+      ptr = json_object_array_get_idx(json, i);
+      wid = json_int_by_name(ptr, "id", -1);
       if(wid!=-99 && !workspace_from_id(GINT_TO_POINTER(wid)))
       {
         ws = workspace_new(GINT_TO_POINTER(wid));
         workspace_set_name(ws, json_string_by_name(ptr, "name"));
       }
     }
   json_object_put(json);
-  if(!hypr_ipc_request(ipc_sockaddr,"j/monitors",&json) || !json)
+  if(!hypr_ipc_request(ipc_sockaddr, "j/monitors", &json) || !json)
     return;
   if(json_object_is_type(json, json_type_array))
-    for(i=0;i<json_object_array_length(json);i++)
+    for(i=0; i<json_object_array_length(json); i++)
     {
-      iter = json_object_array_get_idx(json,i);
-      if(json_object_object_get_ex(iter,"activeWorkspace",&ptr) && ptr)
+      iter = json_object_array_get_idx(json, i);
+      if(json_object_object_get_ex(iter, "activeWorkspace", &ptr) && ptr)
       {
-        wid = json_int_by_name(ptr,"id",-99);
-        if(wid!=-99)
+        wid = json_int_by_name(ptr, "id", -99);
+        if(wid!=-99 && (ws = workspace_from_id(GINT_TO_POINTER(wid))) )
         {
-          if(json_bool_by_name(iter,"focused",FALSE))
+          if(json_bool_by_name(iter,"focused", FALSE))
             ws->state |= WS_STATE_FOCUSED | WS_STATE_INVALID;
-          if( (ws = workspace_from_id(GINT_TO_POINTER(wid))) )
-          {
-            ws->state |= WS_STATE_VISIBLE | WS_STATE_INVALID;
-            workspace_set_active(ws, json_string_by_name(iter, "name"));
-          }
+          ws->state |= WS_STATE_VISIBLE | WS_STATE_INVALID;
+          workspace_set_active(ws, json_string_by_name(iter, "name"));
         }
       }
     }