1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
--- expr/fo-expr-eval.c.orig Tue Apr 26 07:13:16 2005
+++ expr/fo-expr-eval.c Wed Jun 15 01:07:29 2005
@@ -1283,6 +1283,9 @@
*/
FoDatatype *result_datatype = NULL;
+ FoDatatype *stack_second = NULL;
+ FoDatatype *stack_third = NULL;
+ FoDatatype *stack_fourth = NULL;
/* First stack entry */
FoDatatype *stack_first = fo_expr_context_pop_stack (context);
@@ -1304,7 +1307,7 @@
}
/* Second stack entry */
- FoDatatype *stack_second = fo_expr_context_pop_stack (context);
+ stack_second = fo_expr_context_pop_stack (context);
/* Handle possible conditions for second stack entry. */
if (stack_second == NULL)
@@ -1324,7 +1327,7 @@
}
/* third stack entry */
- FoDatatype *stack_third = fo_expr_context_pop_stack (context);
+ stack_third = fo_expr_context_pop_stack (context);
/* Handle possible conditions for third stack entry. */
if (stack_third == NULL)
@@ -1344,7 +1347,7 @@
}
/* fourth stack entry */
- FoDatatype *stack_fourth = fo_expr_context_pop_stack (context);
+ stack_fourth = fo_expr_context_pop_stack (context);
/* Handle possible conditions for fourth stack entry. */
if (stack_fourth == NULL)
@@ -1383,9 +1386,11 @@
static void
eval_padding_expr (FoExprContext *context)
{
+ gchar *name;
+
fo_expr_context_skip_blanks (context);
- gchar *name = parse_ncname (context);
+ name = parse_ncname (context);
if (name == NULL)
{
@@ -1745,11 +1750,12 @@
/* If not 'inherit', then one to four <color> or 'transparent' values. */
do
{
+ gchar *name;
FoDatatype *intermediate_value = NULL;
fo_expr_context_skip_blanks (context);
- gchar *name = parse_ncname (context);
+ name = parse_ncname (context);
if (name != NULL)
{
@@ -1902,6 +1908,8 @@
FoDatatype *width_datatype = NULL;
FoDatatype *style_datatype = NULL;
FoDatatype *color_datatype = NULL;
+ FoDatatype *stack_second;
+ FoDatatype *stack_third;
/* First stack entry */
FoDatatype *stack_first = fo_expr_context_pop_stack (context);
@@ -1941,7 +1949,7 @@
}
/* Second stack entry */
- FoDatatype *stack_second = fo_expr_context_pop_stack (context);
+ stack_second = fo_expr_context_pop_stack (context);
/* Handle possible conditions for second stack entry. */
if (stack_second == NULL)
@@ -1984,7 +1992,7 @@
}
/* Third stack entry */
- FoDatatype *stack_third = fo_expr_context_pop_stack (context);
+ stack_third = fo_expr_context_pop_stack (context);
/* Handle possible conditions for third stack entry. */
if (stack_third == NULL)
|
