Chameleon

Chameleon Commit Details

Date:2013-01-10 17:08:06 (11 years 3 months ago)
Author:armel cadet-petit
Commit:2157
Parents: 2156
Message:updated platform.c and modules.c
Changes:
D/branches/cparm/i386/libsaio/uterror.c
M/branches/cparm/i386/modules/GUI/gui.c
M/branches/cparm/i386/libsaio/CoreHash.h
M/branches/cparm/i386/libsaio/uthash.h
M/branches/cparm/Chameleon.xcodeproj/project.pbxproj
M/branches/cparm/i386/boot2/boot.c
M/branches/cparm/i386/libsaio/Makefile

File differences

branches/cparm/Chameleon.xcodeproj/project.pbxproj
500500
501501
502502
503
504503
505504
506505
......
12391238
12401239
12411240
1242
12431241
12441242
12451243
ABBBFCFB15D55908002D7A1E /* ld_classic.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; path = ld_classic.1; sourceTree = "<group>"; };
ABD521F114F9197900B62550 /* utarray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utarray.h; sourceTree = "<group>"; };
ABD521F214F9197900B62550 /* uthash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uthash.h; sourceTree = "<group>"; };
ABD521F314F9197900B62550 /* uterror.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uterror.c; sourceTree = "<group>"; };
ABD9A1FC150F706A008DA465 /* CoreHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreHash.h; sourceTree = "<group>"; };
ABD9A1FF150F80C4008DA465 /* CoreHash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = CoreHash.c; sourceTree = "<group>"; };
ABE5FF4E14F9495500447F78 /* modules.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = modules.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; };
AB43B34014C37E520018D529 /* ufs_byteorder.h */,
ABD521F114F9197900B62550 /* utarray.h */,
ABD521F214F9197900B62550 /* uthash.h */,
ABD521F314F9197900B62550 /* uterror.c */,
AB43B34114C37E520018D529 /* vbe.c */,
AB43B34214C37E520018D529 /* vbe.h */,
AB43B34314C37E520018D529 /* xml.c */,
branches/cparm/i386/libsaio/uterror.c
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
//
// uterror.c
// Chameleon
//
// Created by cparm on 24/02/12.
// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
//
#include "libsaio.h"
jmp_buf uterror;
void init_ut_fnc(void)
{
}
branches/cparm/i386/libsaio/Makefile
3636
3737
3838
39
39
4040
4141
4242
xml.o md5.o device_tree.o modules.o \
cpu.o platform.o \
fake_efi.o \
convert.o acpi_tools.o smbios.o uterror.o lzss.o lib.o rtc.o time.o gen_uuid-uuid.o pack.o unpack.o CException.o
convert.o acpi_tools.o smbios.o lzss.o lib.o rtc.o time.o gen_uuid-uuid.o pack.o unpack.o CException.o
# Options enabled by default:
branches/cparm/i386/libsaio/CoreHash.h
2222
2323
2424
25
25
2626
2727
2828
static struct HObj * HObj##_FindStrVar(const char *name, struct HObj *container) { \
struct HObj *var; \
\
if (setjmp(uterror) == -1) { \
if (setjmp(uterror) == -1) {\
\
return NULL; \
} else { \
branches/cparm/i386/libsaio/uthash.h
5757
5858
5959
60
60
6161
6262
6363
#define UTHASH_VERSION 1.9.6
#ifndef uthash_fatal
#define uthash_fatal(msg) longjmp(uterror,-1) /* fatal error (out of memory,etc) */
#define uthash_fatal(msg) Throw(-1) /* fatal error (out of memory,etc) */
#endif
#ifndef uthash_malloc
#define uthash_malloc(sz) malloc(sz) /* malloc fcn */
branches/cparm/i386/boot2/boot.c
412412
413413
414414
415
416
417
415
418416
419417
420418
#endif
printf("Starting Chameleon ...\n");
Install_Default_Handler();
init_ut_fnc();
Install_Default_Handler();
initBooterLog();
branches/cparm/i386/modules/GUI/gui.c
4848
4949
5050
51
52
5153
5254
5355
static config_file_t themeConfig; // theme.plist
jmp_buf uterror;
// CoreHash Declarations
__CHNewStrVar(themeList_t)
CHUnInit(themeList_t)

Archive Download the corresponding diff file

Revision: 2157