From: VMware, Inc <>
Date: Thu, 17 Jun 2010 21:06:14 +0000 (-0700)
Subject: Make code use new shared definitions from tclodefs.h.
X-Git-Tag: 2010.06.16-268169~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29eb8bb15b665e162ad5857dd8919c99303ef750;p=thirdparty%2Fopen-vm-tools.git

Make code use new shared definitions from tclodefs.h.

Better than hardcoding the same string in several different places.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/guestApp/guestApp.c b/open-vm-tools/lib/guestApp/guestApp.c
index 17778fb84..b81bddd37 100644
--- a/open-vm-tools/lib/guestApp/guestApp.c
+++ b/open-vm-tools/lib/guestApp/guestApp.c
@@ -1228,28 +1228,6 @@ GuestApp_IsDiskShrinkEnabled(void) {
 }
 
 
-/*
- *-----------------------------------------------------------------------------
- *
- * GuestApp_DiskShrink --
- *
- *      Shrink disk
- *
- * Results:
- *      TRUE if the shrinking is successful
- *      FALSE if disk shrinking is not successful
- * Side effects:
- *	None
- *
- *-----------------------------------------------------------------------------
- */
-
-Bool
-GuestApp_DiskShrink(void) {
-   return RpcOut_sendOne(NULL, NULL, "disk.shrink");
-}
-
-
 /*
  *-----------------------------------------------------------------------------
  *
diff --git a/open-vm-tools/lib/include/guestApp.h b/open-vm-tools/lib/include/guestApp.h
index 630755045..8fbcb9d72 100644
--- a/open-vm-tools/lib/include/guestApp.h
+++ b/open-vm-tools/lib/include/guestApp.h
@@ -122,9 +122,6 @@ GuestApp_IsDiskShrinkEnabled(void);
 Bool
 GuestApp_IsDiskShrinkCapable(void);
 
-Bool
-GuestApp_DiskShrink(void);
-
 void
 GuestApp_GetPos(int16 *x,  // OUT
                 int16 *y); // OUT
diff --git a/open-vm-tools/toolbox/toolboxShrink.c b/open-vm-tools/toolbox/toolboxShrink.c
index 1d5dedef9..568c8f623 100644
--- a/open-vm-tools/toolbox/toolboxShrink.c
+++ b/open-vm-tools/toolbox/toolboxShrink.c
@@ -245,7 +245,7 @@ Shrink_OnShrinkClicked(GtkButton *btn,     // IN: unused
       if (disks_to_shrink > 0) {
          if (ToolsMain_YesNoBox("Shrink Disk",
                                 "Do you want to shrink the disk(s)?\n")) {
-            if (GuestApp_DiskShrink()) {
+            if (RpcOut_sendOne(NULL, NULL, DISK_SHRINK_CMD)) {
                ToolsMain_MsgBox("Information", "The shrink process has finished.");
             }
             gtk_clist_unselect_all(GTK_CLIST(shrinkList));