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
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
--- bdf.c
+++ bdf.c
@@ -1092,7 +1092,7 @@
static void
_bdf_add_property(bdf_font_t *font, char *name, char *value)
{
- unsigned int propid;
+ unsigned long propid;
hashnode hn;
int len;
bdf_property_t *prop, *fp;
@@ -1105,7 +1105,7 @@
* The property already exists in the font, so simply replace
* the value of the property with the current value.
*/
- fp = font->props + (unsigned int) hn->data;
+ fp = font->props + (unsigned long) hn->data;
switch (fp->format) {
case BDF_ATOM:
@@ -1159,7 +1159,7 @@
font->props_size++;
}
- propid = (unsigned int) hn->data;
+ propid = (unsigned long) hn->data;
if (propid >= _num_bdf_properties)
prop = user_props + (propid - _num_bdf_properties);
else
@@ -1199,7 +1199,7 @@
/*
* Add the property to the font property table.
*/
- hash_insert(fp->name, (void *) font->props_used,
+ hash_insert(fp->name, (void *) ((unsigned long) font->props_used),
(hashtable *) font->internal);
font->props_used++;
@@ -1883,7 +1883,7 @@
void
bdf_setup(void)
{
- unsigned int i;
+ unsigned long i;
bdf_property_t *prop;
hash_init(&proptbl);
@@ -3206,7 +3206,7 @@
void
bdf_create_property(char *name, int format)
{
- unsigned int n;
+ unsigned long n;
bdf_property_t *p;
/*
@@ -3243,7 +3243,7 @@
bdf_get_property(char *name)
{
hashnode hn;
- unsigned int propid;
+ unsigned long propid;
if (name == 0 || *name == 0)
return 0;
@@ -3251,7 +3251,7 @@
if ((hn = hash_lookup(name, &proptbl)) == 0)
return 0;
- propid = (unsigned int) hn->data;
+ propid = (unsigned long) hn->data;
if (propid >= _num_bdf_properties)
return user_props + (propid - _num_bdf_properties);
return _bdf_properties + propid;
@@ -3333,7 +3333,7 @@
bdf_add_font_property(bdf_font_t *font, bdf_property_t *property)
{
int len;
- unsigned int propid;
+ unsigned long propid;
hashnode hn;
bdf_property_t *p, *ip;
@@ -3360,7 +3360,7 @@
* If the property exists and is a user defined property, make sure
* its format is updated to match the property being added.
*/
- propid = (unsigned int) hn->data;
+ propid = (unsigned long) hn->data;
if (propid >= _num_bdf_properties) {
p = user_props + (propid - _num_bdf_properties);
if (p->format != property->format)
@@ -3376,7 +3376,7 @@
/*
* Changing an existing property value.
*/
- p = font->props + ((unsigned int) hn->data);
+ p = font->props + ((unsigned long) hn->data);
/*
* If the format changed, then free the atom value if the original
@@ -3433,7 +3433,7 @@
* name of the property.
*/
hn = hash_lookup(property->name, &proptbl);
- propid = (unsigned int) hn->data;
+ propid = (unsigned long) hn->data;
if (propid >= _num_bdf_properties)
ip = user_props + (propid - _num_bdf_properties);
else
@@ -3480,7 +3480,7 @@
/*
* Now insert it into the internal hash table.
*/
- hash_insert(p->name, (void *) font->props_used,
+ hash_insert(p->name, (void *) ((unsigned long) font->props_used),
(hashtable *) font->internal);
font->props_used++;
}
@@ -3552,7 +3552,7 @@
bdf_delete_font_property(bdf_font_t *font, char *name)
{
hashnode hn;
- unsigned int off;
+ unsigned long off;
bdf_property_t *p;
if (font == 0 || name == 0 || *name == 0 || font->props_used == 0)
@@ -3561,7 +3561,7 @@
if ((hn = hash_lookup(name, (hashtable *) font->internal)) == 0)
return;
- off = (unsigned int) hn->data;
+ off = (unsigned long) hn->data;
p = font->props + off;
/*
@@ -3616,7 +3616,7 @@
return 0;
hn = hash_lookup(name, (hashtable *) font->internal);
- return (hn) ? (font->props + ((unsigned int) hn->data)) : 0;
+ return (hn) ? (font->props + ((unsigned long) hn->data)) : 0;
}
typedef struct {
--- guifile.c
+++ guifile.c
@@ -1858,7 +1858,7 @@
/*
* Now set up a file name.
*/
- sprintf(buffer1, "%.*s.bdf", dot - file, file);
+ sprintf(buffer1, "%.*s.bdf", (int) (dot - file), file);
/*
* Delete the file and path names so they can be updated.
|
