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

Commit 35949a05 authored by Stephen Hines's avatar Stephen Hines Committed by android-build-merger
Browse files

Merge "NFC: Directly initialize the 's' variable." am: 566c24cf am: eb541541 

am: c1a72e00

Change-Id: I65f8bc6c658ed18c3533d2d130192507d8d7564e
parents a23e8a9f c1a72e00

cmds/bugreport/bugreport.cpp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int main() { 
  property_set("ctl.start", "dumpstate");



  // Socket will not be available until service starts.

  int s;

  int s = -1;

  for (int i = 0; i < 20; i++) {

    s = socket_local_client("dumpstate", ANDROID_SOCKET_NAMESPACE_RESERVED,

                            SOCK_STREAM);

cmds/bugreportz/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int main(int argc, char* argv[]) { 
    property_set("ctl.start", "dumpstatez");



    // Socket will not be available until service starts.

    int s;

    int s = -1;

    for (int i = 0; i < 20; i++) {

        s = socket_local_client("dumpstate", ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_STREAM);

        if (s >= 0) break;