Clean up productState.h

diff --git a/open-vm-tools/lib/include/productState.h b/open-vm-tools/lib/include/productState.h
index 7d8c6f202639474bbf310e3c1573c0efb3e16ffc..1888c585ffbd3117f4d726d61d36aa3425a20c14 100644 (file)
--- a/open-vm-tools/lib/include/productState.h
+++ b/open-vm-tools/lib/include/productState.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2006-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-2017 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -85,38 +85,47 @@ typedef enum {
  * Public functions.
  *
  * PR 567850
- * ProductState_Set should only be called once. Subsequent calls will be ignored.
+ * ProductState_Set should only be called once. Subsequent calls will be
+ * ignored.
  */
 
-void ProductState_Set(Product product, const char *name, const char *version,
-                      unsigned int buildNumber, ProductCaps capabilities,
-                      const char *licenseName, const char *licenseVersion,
+void ProductState_Set(Product product,
+                      const char *name,
+                      const char *version,
+                      unsigned int buildNumber,
+                      ProductCaps capabilities,
+                      const char *licenseName,
+                      const char *licenseVersion,
                       const char *bundleIdentifier);
 
-Product ProductState_GetProduct(void);
+unsigned int ProductState_GetBuildNumber(void);
+const char  *ProductState_GetBuildNumberString(void);
+const char  *ProductState_GetBundleIdentifier(void);
+ProductCaps  ProductState_GetCapabilities(void);
+const char  *ProductState_GetCompilationOption(void);
+const char  *ProductState_GetConfigName(void);
+const char  *ProductState_GetFullVersion(void);
+const char  *ProductState_GetLicenseName(void);
+const char  *ProductState_GetLicenseVersion(void);
+const char  *ProductState_GetName(void);
+Product      ProductState_GetProduct(void);
+const char  *ProductState_GetRegistryPath(void);
+char        *ProductState_GetRegistryPathForProduct(const char *productName);
+const char  *ProductState_GetVersion(void);
+void         ProductState_GetVersionNumber(unsigned int *major,
+                                          unsigned int *minor,
+                                          unsigned int *patchLevel);
+
 Bool ProductState_IsProduct(ProductMask product);
 Bool ProductState_AllowUnlicensedVMX(void);
-const char *ProductState_GetName(void);
-const char *ProductState_GetVersion(void);
-unsigned int ProductState_GetBuildNumber(void);
-ProductCaps ProductState_GetCapabilities(void);
-const char *ProductState_GetLicenseName(void);
-const char *ProductState_GetLicenseVersion(void);
+
 void ProductState_SetConfigName(const char *configName);
-const char *ProductState_GetConfigName(void);
 /* etc */
 
-const char *ProductState_GetCompilationOption(void);
-const char *ProductState_GetFullVersion(void);
-const char *ProductState_GetBuildNumberString(void);
-const char *ProductState_GetRegistryPath(void);
-char *ProductState_GetRegistryPathForProduct(const char *productName);
-const char *ProductState_GetBundleIdentifier(void);
-void ProductState_GetVersionNumber(unsigned int *major, unsigned int *minor,
-                                   unsigned int *patchLevel);
-
-void ProductState_SetHelp(Product helpProduct, const char *helpVersion);
-void ProductState_GetHelp(Product *helpProduct, const char **helpVersion);
+void ProductState_SetHelp(Product helpProduct,
+                          const char *helpVersion);
+void ProductState_GetHelp(Product *helpProduct,
+                          const char **helpVersion);
 
 char *ProductState_Serialize(ProductStateSerializationFlags flags);
 ProductStateSerializationFlags ProductState_Deserialize(const char *state);