Make clippy happy

DataDog · Jul 31, 2024 · 4b8b184 · 4b8b184
1 parent ca4e4bc
commit 4b8b184
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/sidecar/src/windows.rs b/sidecar/src/windows.rs
@@ -136,18 +136,22 @@ fn fetch_sidecar_identifier() -> String {
     unsafe {
         let mut access_token = null_mut();
 
-        loop {
-            if OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, 1, &mut access_token) != 0 {
-                break;
+        unsafe fn get_token(access_token: &mut HANDLE) -> io::Result<()> {
+            if OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, 1, access_token) != 0 {
+                return Ok(());
             }
             let mut err = Error::last_os_error();
             if err.raw_os_error() == Some(ERROR_NO_TOKEN as i32) {
-                if OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &mut access_token) != 0 {
-                    break;
+                if OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, access_token) != 0 {
+                    return Ok(());
                 }
                 err = Error::last_os_error();
             }
-            error!("Failed fetching thread token: {:?}", err);
+            return Err(err);
+        }
+
+        if let Err(e) = get_token(&mut access_token) {
+            error!("Failed fetching thread token: {:?}", e);
             return "".to_string();
         }