Chameleon

Chameleon Commit Details

Date:2010-09-09 07:15:31 (8 years 10 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

branches/azimutz/Chazi/i386/libsaio/stringTable.c
501501
502502
503503
504
504
505505
506506
507
507
508508
509509
510510
{
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)
branches/azimutz/Chazi/i386/boot2/options.c
12861286
12871287
12881288
1289
1289
12901290
12911291
12921292
1293
1293
12941294
12951295
12961296
} 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 );
}
}

Archive Download the corresponding diff file

Revision: 508