Chameleon Commit Details - 508 - Chameleon open source boot loader project.

Date:

2010-09-09 07:15:31 (13 years 7 months ago)

Author:

Azimutz

Commit:

508

Parents:

507

Message:

Changing kDefaultKernel identifier to kDefaultKernelName; will apply the same principle to all preprocessor identifiers, who's string is a default "name" of an object (file, folder, etc...).

Changes:

M	/branches/azimutz/Chazi/i386/boot2/options.c
M	/branches/azimutz/Chazi/i386/libsaio/stringTable.c

File differences

-501
502 502
503 503
504 
504
505 505
506 506
507 
507
508 508
509 509
510 510
+    {␊
      override = true;␊
␊
      if (ret && (strcmp(key, "Kernel") == 0) && (strcmp(overrideVal, "mach_kernel") == 0))␊
      if (ret && (strcmp(key, kKernelNameKey) == 0) && (strcmp(overrideVal, kDefaultKernelName) == 0))␊
        override = false;␊
␊
      if (ret && (strcmp(key, "Kernel Flags") == 0) && (overrideSize == 0))␊
      if (ret && (strcmp(key, kKernelFlagsKey) == 0) && (overrideSize == 0))␊
        override = false;␊
␊
      if (override)␊
     {␊
       override = true;␊
 ␊
-      if (ret && (strcmp(key, "Kernel") == 0) && (strcmp(overrideVal, "mach_kernel") == 0))␊
+      if (ret && (strcmp(key, kKernelNameKey) == 0) && (strcmp(overrideVal, kDefaultKernelName) == 0))␊
         override = false;␊
 ␊
-      if (ret && (strcmp(key, "Kernel Flags") == 0) && (overrideSize == 0))␊
+      if (ret && (strcmp(key, kKernelFlagsKey) == 0) && (overrideSize == 0))␊
         override = false;␊
 ␊
       if (override)␊

-1286
1287 1287
1288 1288
1289 
1289
1290 1290
1291 1291
1292 1292
1293 
1293
1294 1294
1295 1295
1296 1296
+    } else {␊
        if ( getValueForKey( kKernelNameKey, &val, &cnt, &bootInfo->bootConfig ) ) {␊
            strlcpy( bootInfo->bootFile, val, cnt+1 );␊
            if (strcmp( bootInfo->bootFile, kDefaultKernel ) != 0) {␊
            if (strcmp( bootInfo->bootFile, kDefaultKernelName ) != 0) {␊
                gOverrideKernel = true;␊
            }␊
        } else {␊
            strcpy( bootInfo->bootFile, kDefaultKernel );␊
            strcpy( bootInfo->bootFile, kDefaultKernelName );␊
        }␊
    }␊
␊
     } else {␊
         if ( getValueForKey( kKernelNameKey, &val, &cnt, &bootInfo->bootConfig ) ) {␊
             strlcpy( bootInfo->bootFile, val, cnt+1 );␊
-            if (strcmp( bootInfo->bootFile, kDefaultKernel ) != 0) {␊
+            if (strcmp( bootInfo->bootFile, kDefaultKernelName ) != 0) {␊
                 gOverrideKernel = true;␊
             }␊
         } else {␊
-            strcpy( bootInfo->bootFile, kDefaultKernel );␊
+            strcpy( bootInfo->bootFile, kDefaultKernelName );␊
         }␊
     }␊
 ␊

Download the corresponding diff file