Chameleon

Chameleon Commit Details

Date:2015-06-09 20:32:56 (8 years 10 months ago)
Author:ErmaC
Commit:2709
Parents: 2708
Message:Typo
Changes:
M/trunk/i386/libsaio/sys.c
M/trunk/i386/libsaio/biosfn.c
M/trunk/i386/libsaio/xml.c

File differences

trunk/i386/libsaio/xml.c
276276
277277
278278
279
280
281
282
279
280
281
282
283283
284284
285285
......
396396
397397
398398
399
400
399
400
401401
402402
403403
......
822822
823823
824824
825
825
826826
827827
828828
#define _e(str,c) {str,sizeof(str)-1,c}␊
const XMLEntity ents[] = {␊
␉_e("quot;",'"'), // double quotation mark␊
␉_e("apos;",'\''), // ampersand␊
␉_e("lt;", '<'), // apostrophe (apostrophe-quote)␊
␉_e("gt;", '>'), // less-than sign␊
␉_e("amp;", '&') // greater-than sign␊
␉_e("apos;",'\''), // apostrophe (apostrophe-quote)␊
␉_e("lt;", '<'), // less-than sign␊
␉_e("gt;", '>'), // greater-than sign␊
␉_e("amp;", '&') // ampersand␊
};␊
␊
/* Function for basic XML character entities parsing */␊
␉if (!strncmp(tagName, kXMLTagPList, 6))␊
␉{␊
␉␉length = 0;␊
// just a header; nothing to parse␊
// return-via-reference tag should be left alone␊
␉␉// just a header; nothing to parse␊
␉␉// return-via-reference tag should be left alone␊
␉}␊
␉/***** dict ****/␊
␉else if (!strncmp(tagName, kXMLTagDict, sizeof(kXMLTagDict)))␊
␉{␊
␉␉val += 2;␊
␉␉while(*val)␊
␉␉{␉␉␉␊
␉␉{␊
␉␉␉if ((*val >= '0' && *val <= '9'))␉// 0 - 9␊
␉␉␉{␊
␉␉␉␉integer = (integer * 16) + (*val++ - '0');␊
trunk/i386/libsaio/sys.c
8282
8383
8484
85
86
85
86
8787
8888
8989
......
969969
970970
971971
972
972
973973
974974
975975
......
994994
995995
996996
997
997
998998
999999
10001000
......
10281028
10291029
10301030
1031
1031
10321032
10331033
10341034
......
10381038
10391039
10401040
1041
1041
10421042
10431043
10441044
......
11401140
11411141
11421142
1143
1143
11441144
11451145
11461146
␉#define DBG(x...)␉msglog(x)␊
#endif␊
␊
#ifndef DEBUG_FEATURE_LAST_BOOT␊
␉#define DEBUG_FEATURE_LAST_BOOT 0 // AllocateKernelMemory error with feature from 2562␊
#ifndef FEATURE_LAST_BOOT␊
␉#define FEATURE_LAST_BOOT 0 // AllocateKernelMemory error with feature from 2562␊
#endif␊
␊
extern int multiboot_partition;␊
␉BVRef bvr1␉␉= NULL;␊
␉BVRef bvr2␉␉= NULL;␊
␊
#if DEBUG_FEATURE_LAST_BOOT␊
#if FEATURE_LAST_BOOT␊
␉char dirSpec[]␉␉= "hd(%d,%d)/";␊
␉char fileSpec[]␉␉= "Volumes";␊
␉char *label;␊
␊
␉␉␉if ( (bvr->part_no == multiboot_partition) && (bvr->biosdev == gBIOSDev) )␊
␉␉␉{␊
#if DEBUG_FEATURE_LAST_BOOT␊
#if FEATURE_LAST_BOOT␊
␉␉␉␉label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));␊
␉␉␉␉DBG("Multiboot partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);␊
#endif␊
␉␉␉if (matchVolumeToString(bvr, val, false))␊
␉␉␉{␊
␉␉␉␉free(val);␊
#if DEBUG_FEATURE_LAST_BOOT␊
#if FEATURE_LAST_BOOT␊
␉␉␉␉label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));␊
␉␉␉␉DBG("User default partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);␊
#endif␊
␉␉free(val);␊
␉}␊
␊
#if DEBUG_FEATURE_LAST_BOOT // the above code cause "AllocateKernelMemory error"␊
#if FEATURE_LAST_BOOT // the above code cause "AllocateKernelMemory error"␊
␉// Bungo: select last booted partition as the boot volume␊
␉// TODO: support other OSes (foreign boot)␊
␉for (bvr = chain; bvr; bvr = bvr->next)␊
␉}␊
␊
␉bvr = bvr2 ? bvr2 : (bvr1 ? bvr1 : chain);␊
#if DEBUG_FEATURE_LAST_BOOT␊
#if FEATURE_LAST_BOOT␊
␉label = bvr->label[0] ? bvr->label : (bvr->altlabel[0] ? bvr->altlabel : (bvr->name[0] ? bvr->name : "Untitled"));␊
␉DBG("Default partition set: hd(%d,%d) '%s'\n", BIOS_DEV_UNIT(bvr), bvr->part_no, label);␊
#endif␊
trunk/i386/libsaio/biosfn.c
4444
4545
4646
47
47
4848
4949
5050
#include "libsaio.h"␊
␊
␊
#ifndef DEBUG_MEMRANGE␊
#ifndef MEMRANGE␊
␉#define MEMRANGE 0␊
#endif␊
␊

Archive Download the corresponding diff file

Revision: 2709