Much rearranging of cgptlib. Passes all its (new) unit tests.

src/platform/vboot_reference/utility/cgpt/cgpt.h

 /* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  * Header file for cgpt.
  */
 #ifndef VBOOT_REFERENCE_UTILITY_CGPT_CGPT_H_
 #define VBOOT_REFERENCE_UTILITY_CGPT_CGPT_H_
 
 #include <getopt.h>
 #include <stdint.h>
 #include "cgptlib.h"
+#include "gpt.h"
 
 enum {
   CGPT_OK = 0,
   CGPT_FAILED,  /* generic error */
 };
 
 #define NOT_INITED (-1)  /* to indicated a signed integer is not initialed. */
 
 #define ARRAY_COUNT(array) (sizeof(array)/sizeof((array)[0]))
 
@@ skipping 124 matching lines @@
 
 /* Function declarations for commands.
  * The return value of these functions is passed to main()'s exit value. */
 int CgptAdm(int argc, char *argv[]);
 int CgptAttribute(int argc, char *argv[]);
 int CgptDev(int argc, char *argv[]);
 int CgptRepair(int argc, char *argv[]);
 int CgptShow(int argc, char *argv[]);
 
 #endif  /* VBOOT_REFERENCE_UTILITY_CGPT_CGPT_H_ */