Clean up some code in hostinfo.

Remove duplicate declarations in hostinfo.h
Re-indent some lines in hostinfoPosix.c

diff --git a/open-vm-tools/lib/include/hostinfo.h b/open-vm-tools/lib/include/hostinfo.h
index bc42f464fbeb9140250268b10af4907238b4f9db..cc85a0c66c864c241ec9a72cbb8cd7f444de4f2d 100644 (file)
--- a/open-vm-tools/lib/include/hostinfo.h
+++ b/open-vm-tools/lib/include/hostinfo.h
@@ -122,9 +122,6 @@ int Hostinfo_OSVersion(unsigned int i);
 int Hostinfo_GetSystemBitness(void);
 const char *Hostinfo_OSVersionString(void);
 
-char *Hostinfo_GetOSName(void);
-char *Hostinfo_GetOSGuestString(void);
-
 #if defined(_WIN32)
 Bool Hostinfo_OSIsWinNT(void);
 Bool Hostinfo_OSIsWow64(void);

diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 941bc053acd0b2b816c5d8ac92485dc4cef464c1..0ef33b03a218434c81957e4e168fe4815e594c64 100644 (file)
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -3207,16 +3207,16 @@ Hostinfo_Execute(const char *path,   // IN:
 
    if (wait) {
       for (;;) {
-        if (waitpid(pid, &status, 0) == -1) {
-           if (errno == ECHILD) {
-              return 0;        // This sucks.  We really don't know.
-           }
-           if (errno != EINTR) {
-              return -1;
-           }
-        } else {
-           return status;
-        }
+         if (waitpid(pid, &status, 0) == -1) {
+            if (errno == ECHILD) {
+               return 0;   // This sucks.  We really don't know.
+            }
+            if (errno != EINTR) {
+               return -1;
+            }
+         } else {
+            return status;
+         }
       }
    } else {
       return 0;