Ignore:
Timestamp:
Aug 21, 2001, 7:29:38 PM (24 years ago)
Author:
umoeller
Message:

Misc updates.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/helpers/xmltok.c

    r97 r98  
    8686
    8787static
    88 int isNever(const ENCODING * enc, const char *p)
     88int EXPATENTRY isNever(const ENCODING * enc, const char *p)
    8989{
    9090    return 0;
    … …  
    9292
    9393static
    94 int utf8_isName2(const ENCODING * enc, const char *p)
     94int EXPATENTRY utf8_isName2(const ENCODING * enc, const char *p)
    9595{
    9696    return UTF8_GET_NAMING2(namePages, (const unsigned char *)p);
    … …  
    9898
    9999static
    100 int utf8_isName3(const ENCODING * enc, const char *p)
     100int EXPATENTRY utf8_isName3(const ENCODING * enc, const char *p)
    101101{
    102102    return UTF8_GET_NAMING3(namePages, (const unsigned char *)p);
    … …  
    106106
    107107static
    108 int utf8_isNmstrt2(const ENCODING * enc, const char *p)
     108int EXPATENTRY utf8_isNmstrt2(const ENCODING * enc, const char *p)
    109109{
    110110    return UTF8_GET_NAMING2(nmstrtPages, (const unsigned char *)p);
    … …  
    112112
    113113static
    114 int utf8_isNmstrt3(const ENCODING * enc, const char *p)
     114int EXPATENTRY utf8_isNmstrt3(const ENCODING * enc, const char *p)
    115115{
    116116    return UTF8_GET_NAMING3(nmstrtPages, (const unsigned char *)p);
    … …  
    122122
    123123static
    124 int utf8_isInvalid3(const ENCODING * enc, const char *p)
     124int EXPATENTRY utf8_isInvalid3(const ENCODING * enc, const char *p)
    125125{
    126126    return UTF8_INVALID3((const unsigned char *)p);
    … …  
    128128
    129129static
    130 int utf8_isInvalid4(const ENCODING * enc, const char *p)
     130int EXPATENTRY utf8_isInvalid4(const ENCODING * enc, const char *p)
    131131{
    132132    return UTF8_INVALID4((const unsigned char *)p);
    … …  
    138138    unsigned char type[256];
    139139#ifdef XML_MIN_SIZE
    140     int (*byteType) (const ENCODING *, const char *);
    141     int (*isNameMin) (const ENCODING *, const char *);
    142     int (*isNmstrtMin) (const ENCODING *, const char *);
    143     int (*byteToAscii) (const ENCODING *, const char *);
    144     int (*charMatches) (const ENCODING *, const char *, int);
     140    int (* EXPATENTRY byteType) (const ENCODING *, const char *);
     141    int (* EXPATENTRY isNameMin) (const ENCODING *, const char *);
     142    int (* EXPATENTRY isNmstrtMin) (const ENCODING *, const char *);
     143    int (* EXPATENTRY byteToAscii) (const ENCODING *, const char *);
     144    int (* EXPATENTRY charMatches) (const ENCODING *, const char *, int);
    145145#endif                          /* XML_MIN_SIZE */
    146     int (*isName2) (const ENCODING *, const char *);
    147     int (*isName3) (const ENCODING *, const char *);
    148     int (*isName4) (const ENCODING *, const char *);
    149     int (*isNmstrt2) (const ENCODING *, const char *);
    150     int (*isNmstrt3) (const ENCODING *, const char *);
    151     int (*isNmstrt4) (const ENCODING *, const char *);
    152     int (*isInvalid2) (const ENCODING *, const char *);
    153     int (*isInvalid3) (const ENCODING *, const char *);
    154     int (*isInvalid4) (const ENCODING *, const char *);
     146    int (* EXPATENTRY isName2) (const ENCODING *, const char *);
     147    int (* EXPATENTRY isName3) (const ENCODING *, const char *);
     148    int (* EXPATENTRY isName4) (const ENCODING *, const char *);
     149    int (* EXPATENTRY isNmstrt2) (const ENCODING *, const char *);
     150    int (* EXPATENTRY isNmstrt3) (const ENCODING *, const char *);
     151    int (* EXPATENTRY isNmstrt4) (const ENCODING *, const char *);
     152    int (* EXPATENTRY isInvalid2) (const ENCODING *, const char *);
     153    int (* EXPATENTRY isInvalid3) (const ENCODING *, const char *);
     154    int (* EXPATENTRY isInvalid4) (const ENCODING *, const char *);
    155155};
    156156
    … …  
    202202
    203203#ifdef XML_MIN_SIZE
    204 static
    205 int sb_byteType(const ENCODING * enc, const char *p)
     204static int EXPATENTRY sb_byteType(const ENCODING * enc, const char *p)
    206205{
    207206    return SB_BYTE_TYPE(enc, p);
    … …  
    217216 (((const struct normal_encoding *)(enc))->byteToAscii(enc, p))
    218217static
    219 int sb_byteToAscii(const ENCODING * enc, const char *p)
     218int EXPATENTRY sb_byteToAscii(const ENCODING * enc, const char *p)
    220219{
    221220    return *p;
    … …  
    246245 (((const struct normal_encoding *)(enc))->charMatches(enc, p, c))
    247246static
    248 int sb_charMatches(const ENCODING * enc, const char *p, int c)
     247int EXPATENTRY sb_charMatches(const ENCODING * enc, const char *p, int c)
    249248{
    250249    return *p == c;
    … …  
    276275};
    277276
    278 static void utf8_toUtf8(const ENCODING * enc,
     277static void EXPATENTRY utf8_toUtf8(const ENCODING * enc,
    279278                        const char **fromP,
    280279                        const char *fromLim,
    … …  
    302301}
    303302
    304 static void utf8_toUtf16(const ENCODING * enc,
     303static void EXPATENTRY utf8_toUtf16(const ENCODING * enc,
    305304                         const char **fromP,
    306305                         const char *fromLim,
    … …  
    397396};
    398397
    399 static void latin1_toUtf8(const ENCODING * enc,
     398static void  EXPATENTRY latin1_toUtf8(const ENCODING * enc,
    400399                          const char **fromP,
    401400                          const char *fromLim,
    … …  
    427426}
    428427
    429 static void latin1_toUtf16(const ENCODING * enc,
     428static void  EXPATENTRY latin1_toUtf16(const ENCODING * enc,
    430429                           const char **fromP,
    431430                           const char *fromLim,
    … …  
    463462};
    464463
    465 static void ascii_toUtf8(const ENCODING * enc,
     464static void EXPATENTRY ascii_toUtf8(const ENCODING * enc,
    466465                         const char **fromP,
    467466                         const char *fromLim,
    … …  
    526525
    527526#define DEFINE_UTF16_TO_UTF8(E) \
    528 static \
    529 void E ## toUtf8(const ENCODING *enc, \
     527static void EXPATENTRY E ## toUtf8(const ENCODING *enc, \
    530528         const char **fromP, const char *fromLim, \
    531529         char **toP, const char *toLim) \
    … …  
    589587
    590588#define DEFINE_UTF16_TO_UTF16(E) \
    591 static \
    592 void E ## toUtf16(const ENCODING *enc, \
     589static void EXPATENTRY E ## toUtf16(const ENCODING *enc, \
    593590          const char **fromP, const char *fromLim, \
    594591          unsigned short **toP, const unsigned short *toLim) \
    … …  
    638635
    639636#ifdef XML_MIN_SIZE
    640 
    641      static
    642      int little2_byteType(const ENCODING * enc, const char *p)
     637static int  EXPATENTRY little2_byteType(const ENCODING * enc, const char *p)
    643638{
    644639    return LITTLE2_BYTE_TYPE(enc, p);
    645640}
    646641
    647 static int little2_byteToAscii(const ENCODING * enc, const char *p)
     642static int  EXPATENTRY little2_byteToAscii(const ENCODING * enc, const char *p)
    648643{
    649644    return LITTLE2_BYTE_TO_ASCII(enc, p);
    650645}
    651646
    652 static int little2_charMatches(const ENCODING * enc, const char *p, int c)
     647static int  EXPATENTRY little2_charMatches(const ENCODING * enc, const char *p, int c)
    653648{
    654649    return LITTLE2_CHAR_MATCHES(enc, p, c);
    655650}
    656651
    657 static int little2_isNameMin(const ENCODING * enc, const char *p)
     652static int  EXPATENTRY little2_isNameMin(const ENCODING * enc, const char *p)
    658653{
    659654    return LITTLE2_IS_NAME_CHAR_MINBPC(enc, p);
    660655}
    661656
    662 static int little2_isNmstrtMin(const ENCODING * enc, const char *p)
     657static int  EXPATENTRY little2_isNmstrtMin(const ENCODING * enc, const char *p)
    663658{
    664659    return LITTLE2_IS_NMSTRT_CHAR_MINBPC(enc, p);
    … …  
    778773#ifdef XML_MIN_SIZE
    779774
    780 static int big2_byteType(const ENCODING * enc, const char *p)
     775static int  EXPATENTRY big2_byteType(const ENCODING * enc, const char *p)
    781776{
    782777    return BIG2_BYTE_TYPE(enc, p);
    783778}
    784779
    785 static int big2_byteToAscii(const ENCODING * enc, const char *p)
     780static int  EXPATENTRY big2_byteToAscii(const ENCODING * enc, const char *p)
    786781{
    787782    return BIG2_BYTE_TO_ASCII(enc, p);
    788783}
    789784
    790 static int big2_charMatches(const ENCODING * enc, const char *p, int c)
     785static int  EXPATENTRY big2_charMatches(const ENCODING * enc, const char *p, int c)
    791786{
    792787    return BIG2_CHAR_MATCHES(enc, p, c);
    793788}
    794789
    795 static int big2_isNameMin(const ENCODING * enc, const char *p)
     790static int  EXPATENTRY big2_isNameMin(const ENCODING * enc, const char *p)
    796791{
    797792    return BIG2_IS_NAME_CHAR_MINBPC(enc, p);
    798793}
    799794
    800 static int big2_isNmstrtMin(const ENCODING * enc, const char *p)
     795static int  EXPATENTRY big2_isNmstrtMin(const ENCODING * enc, const char *p)
    801796{
    802797    return BIG2_IS_NMSTRT_CHAR_MINBPC(enc, p);
    … …  
    923918}
    924919
    925 static void initUpdatePosition(const ENCODING * enc, const char *ptr,
     920static void  EXPATENTRY initUpdatePosition(const ENCODING * enc, const char *ptr,
    926921                        const char *end, POSITION * pos)
    927922{
    … …  
    929924}
    930925
    931 static int toAscii(const ENCODING * enc, const char *ptr, const char *end)
     926static int  EXPATENTRY toAscii(const ENCODING * enc, const char *ptr, const char *end)
    932927{
    933928    char buf[1];
    … …  
    941936}
    942937
    943 static int isSpace(int c)
     938static int  EXPATENTRY isSpace(int c)
    944939{
    945940    switch (c)
    … …  
    956951/* Return 1 if there's just optional white space
    957952 * or there's an S followed by name=val. */
    958 static int parsePseudoAttribute(const ENCODING * enc,
     953static int  EXPATENTRY parsePseudoAttribute(const ENCODING * enc,
    959954                                const char *ptr,
    960955                                const char *end,
    … …  
    12881283}
    12891284
    1290 static int unknown_isName(const ENCODING * enc, const char *p)
     1285static int  EXPATENTRY unknown_isName(const ENCODING * enc, const char *p)
    12911286{
    12921287    int c = ((const struct unknown_encoding *)enc)
    … …  
    12981293}
    12991294
    1300 static int unknown_isNmstrt(const ENCODING * enc, const char *p)
     1295static int  EXPATENTRY unknown_isNmstrt(const ENCODING * enc, const char *p)
    13011296{
    13021297    int c = ((const struct unknown_encoding *)enc)
    … …  
    13081303}
    13091304
    1310 static int unknown_isInvalid(const ENCODING * enc, const char *p)
     1305static int  EXPATENTRY unknown_isInvalid(const ENCODING * enc, const char *p)
    13111306{
    13121307    int c = ((const struct unknown_encoding *)enc)
    … …  
    13161311}
    13171312
    1318 static void unknown_toUtf8(const ENCODING * enc,
     1313static void  EXPATENTRY unknown_toUtf8(const ENCODING * enc,
    13191314                           const char **fromP,
    13201315                           const char *fromLim,
    … …  
    13591354}
    13601355
    1361 static void unknown_toUtf16(const ENCODING * enc,
     1356static void  EXPATENTRY unknown_toUtf16(const ENCODING * enc,
    13621357                            const char **fromP,
    13631358                            const char *fromLim,
    … …  
    13951390{
    13961391    int i;
    1397     struct unknown_encoding *e = mem;
     1392    struct unknown_encoding *e = (struct unknown_encoding*)mem;
    13981393
    13991394    // gee, isn't this a regular memcpy?!?
    … …  
    15631558
    15641559
    1565 static int initScan(const ENCODING ** encodingTable,
     1560static int EXPATENTRY initScan(const ENCODING ** encodingTable,
    15661561                    const INIT_ENCODING * enc,
    15671562                    int state,
    … …  
    17081703ENCODING * XmlInitUnknownEncodingNS(void *mem,
    17091704                                    int *table,
    1710                                     int (*convert) (void *userData, const char *p),
     1705                                    int (* EXPATENTRY convert) (void *userData, const char *p),
    17111706                                    void *userData)
    17121707{
Note: See TracChangeset for help on using the changeset viewer.