← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/apache2/oneiric-updates

« back to all changes in this revision

Viewing changes to srclib/apr-util/xml/expat/lib/xmltok_ns.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-02-22 13:02:08 UTC
  • mfrom: (14.3.23 sid)
  • Revision ID: james.westby@ubuntu.com-20110222130208-5hrxnun6a8uygfhv
Tags: 2.2.17-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree
  - debain/apache2.py, debian/apache2.2-common.isntall: Add apport hook.
  - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
    Plymouth aware passphrase dialog program ask-for-passphrase. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
srclib/apr-util/xml/expat/lib/xmltok_ns.c
1
 
const ENCODING *NS(XmlGetUtf8InternalEncoding)(void)
 
1
const ENCODING *
 
2
NS(XmlGetUtf8InternalEncoding)(void)
2
3
{
3
4
  return &ns(internal_utf8_encoding).enc;
4
5
}
5
6
 
6
 
const ENCODING *NS(XmlGetUtf16InternalEncoding)(void)
 
7
const ENCODING *
 
8
NS(XmlGetUtf16InternalEncoding)(void)
7
9
{
8
 
#if XML_BYTE_ORDER == 12
 
10
#if BYTEORDER == 1234
9
11
  return &ns(internal_little2_encoding).enc;
10
 
#elif XML_BYTE_ORDER == 21
 
12
#elif BYTEORDER == 4321
11
13
  return &ns(internal_big2_encoding).enc;
12
14
#else
13
15
  const short n = 1;
14
 
  return *(const char *)&n ? &ns(internal_little2_encoding).enc : &ns(internal_big2_encoding).enc;
 
16
  return (*(const char *)&n
 
17
          ? &ns(internal_little2_encoding).enc
 
18
          : &ns(internal_big2_encoding).enc);
15
19
#endif
16
20
}
17
21
 
18
 
static
19
 
const ENCODING *NS(encodings)[] = {
 
22
static const ENCODING *NS(encodings)[] = {
20
23
  &ns(latin1_encoding).enc,
21
24
  &ns(ascii_encoding).enc,
22
25
  &ns(utf8_encoding).enc,
26
29
  &ns(utf8_encoding).enc /* NO_ENC */
27
30
};
28
31
 
29
 
static
30
 
int NS(initScanProlog)(const ENCODING *enc, const char *ptr, const char *end,
31
 
                       const char **nextTokPtr)
32
 
{
33
 
  return initScan(NS(encodings), (const INIT_ENCODING *)enc, XML_PROLOG_STATE, ptr, end, nextTokPtr);
34
 
}
35
 
 
36
 
static
37
 
int NS(initScanContent)(const ENCODING *enc, const char *ptr, const char *end,
38
 
                       const char **nextTokPtr)
39
 
{
40
 
  return initScan(NS(encodings), (const INIT_ENCODING *)enc, XML_CONTENT_STATE, ptr, end, nextTokPtr);
41
 
}
42
 
 
43
 
int NS(XmlInitEncoding)(INIT_ENCODING *p, const ENCODING **encPtr, const char *name)
 
32
static int PTRCALL
 
33
NS(initScanProlog)(const ENCODING *enc, const char *ptr, const char *end,
 
34
                   const char **nextTokPtr)
 
35
{
 
36
  return initScan(NS(encodings), (const INIT_ENCODING *)enc,
 
37
                  XML_PROLOG_STATE, ptr, end, nextTokPtr);
 
38
}
 
39
 
 
40
static int PTRCALL
 
41
NS(initScanContent)(const ENCODING *enc, const char *ptr, const char *end,
 
42
                    const char **nextTokPtr)
 
43
{
 
44
  return initScan(NS(encodings), (const INIT_ENCODING *)enc,
 
45
                  XML_CONTENT_STATE, ptr, end, nextTokPtr);
 
46
}
 
47
 
 
48
int
 
49
NS(XmlInitEncoding)(INIT_ENCODING *p, const ENCODING **encPtr,
 
50
                    const char *name)
44
51
{
45
52
  int i = getEncodingIndex(name);
46
53
  if (i == UNKNOWN_ENC)
54
61
  return 1;
55
62
}
56
63
 
57
 
static
58
 
const ENCODING *NS(findEncoding)(const ENCODING *enc, const char *ptr, const char *end)
 
64
static const ENCODING *
 
65
NS(findEncoding)(const ENCODING *enc, const char *ptr, const char *end)
59
66
{
60
67
#define ENCODING_MAX 128
61
68
  char buf[ENCODING_MAX];
73
80
  return NS(encodings)[i];
74
81
}
75
82
 
76
 
int NS(XmlParseXmlDecl)(int isGeneralTextEntity,
77
 
                        const ENCODING *enc,
78
 
                        const char *ptr,
79
 
                        const char *end,
80
 
                        const char **badPtr,
81
 
                        const char **versionPtr,
82
 
                        const char **versionEndPtr,
83
 
                        const char **encodingName,
84
 
                        const ENCODING **encoding,
85
 
                        int *standalone)
 
83
int
 
84
NS(XmlParseXmlDecl)(int isGeneralTextEntity,
 
85
                    const ENCODING *enc,
 
86
                    const char *ptr,
 
87
                    const char *end,
 
88
                    const char **badPtr,
 
89
                    const char **versionPtr,
 
90
                    const char **versionEndPtr,
 
91
                    const char **encodingName,
 
92
                    const ENCODING **encoding,
 
93
                    int *standalone)
86
94
{
87
95
  return doParseXmlDecl(NS(findEncoding),
88
 
                        isGeneralTextEntity,
89
 
                        enc,
90
 
                        ptr,
91
 
                        end,
92
 
                        badPtr,
93
 
                        versionPtr,
94
 
                        versionEndPtr,
95
 
                        encodingName,
96
 
                        encoding,
97
 
                        standalone);
 
96
                        isGeneralTextEntity,
 
97
                        enc,
 
98
                        ptr,
 
99
                        end,
 
100
                        badPtr,
 
101
                        versionPtr,
 
102
                        versionEndPtr,
 
103
                        encodingName,
 
104
                        encoding,
 
105
                        standalone);
98
106
}