More code cleanup

vboot_firmware/lib/cgptlib/cgptlib_internal.c

 /* 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.
  */
 
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
 #include "crc32.h"
 #include "gpt.h"
 #include "utility.h"
@@ skipping 84 matching lines @@
   if (h->last_usable_lba >= drive_sectors - 1 - GPT_ENTRIES_SECTORS)
     return 1;
   if (h->first_usable_lba > h->last_usable_lba)
     return 1;
 
   /* Success */
   return 0;
 }
 
 
-/* Return 1 if the entry is unused, 0 if it is used. */
+/* Return non-zero if the entry is unused, 0 if it is used. */
 int IsUnusedEntry(const GptEntry* e) {
   static Guid zero = {{{0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0}}}};
-  return (Memcmp(&zero, (const uint8_t*)(&e->type), sizeof(zero)) ? 0 : 1);
+  return !Memcmp(&zero, (const uint8_t*)(&e->type), sizeof(zero));
 }
 
-/* Returns 1 if the entry is a Chrome OS kernel partition, else 0. */
+/* Returns non-zero if the entry is a Chrome OS kernel partition, else 0. */
 int IsKernelEntry(const GptEntry* e) {
   static Guid chromeos_kernel = GPT_ENT_TYPE_CHROMEOS_KERNEL;
-  return (Memcmp(&e->type, &chromeos_kernel, sizeof(Guid)) ? 0 : 1);
+  return !Memcmp(&e->type, &chromeos_kernel, sizeof(Guid));
 }
 
 
 int CheckEntries(GptEntry* entries, GptHeader* h, uint64_t drive_sectors) {
 
   GptEntry* entry;
   uint32_t crc32;
   int i;
 
   /* Check CRC before examining entries. */
@@ skipping 214 matching lines @@
   e->attributes |= ((uint64_t)priority << CGPT_ATTRIBUTE_PRIORITY_OFFSET) &
       CGPT_ATTRIBUTE_PRIORITY_MASK;
 }
 
 
 void SetEntryTries(GptEntry* e, int tries) {
   e->attributes &= ~CGPT_ATTRIBUTE_TRIES_MASK;
   e->attributes |= ((uint64_t)tries << CGPT_ATTRIBUTE_TRIES_OFFSET) &
       CGPT_ATTRIBUTE_TRIES_MASK;
 }