Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ca6d078 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am b8e6cb08: am e814b43c: Merge "Don\'t use TEMP_FAILURE_RETRY on close in frameworks/native." 

* commit 'b8e6cb08':
  Don't use TEMP_FAILURE_RETRY on close in frameworks/native.
parents 1685750e b8e6cb08

cmds/bugreport/bugreport.cpp

+1 −1
Original line number Diff line number Diff line
@@ -86,6 +86,6 @@ int main() { 
    } while (bytes_written != 0 && bytes_to_send > 0);

  }



  TEMP_FAILURE_RETRY(close(s));

  close(s);

  return 0;

}

cmds/dumpstate/utils.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int _dump_file_from_fd(const char *title, const char *path, int fd) { 
            }

        }

    }

    TEMP_FAILURE_RETRY(close(fd));

    close(fd);



    if (!newline) printf("\n");

    if (title) printf("\n");