forked from pool/gbdfed
16eb6f60f0
please review, contrib cleanup OBS-URL: https://build.opensuse.org/request/show/71757 OBS-URL: https://build.opensuse.org/package/show/M17N/gbdfed?expand=0&rev=1
162 lines
5.1 KiB
Diff
162 lines
5.1 KiB
Diff
Index: bdf.c
|
|
===================================================================
|
|
--- bdf.c.orig
|
|
+++ bdf.c
|
|
@@ -1084,7 +1084,7 @@ _bdf_is_atom(char *line, unsigned int li
|
|
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;
|
|
@@ -1097,7 +1097,7 @@ _bdf_add_property(bdf_font_t *font, char
|
|
* 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:
|
|
@@ -1151,7 +1151,7 @@ _bdf_add_property(bdf_font_t *font, char
|
|
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
|
|
@@ -1191,7 +1191,7 @@ _bdf_add_property(bdf_font_t *font, char
|
|
/*
|
|
* 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++;
|
|
@@ -1876,7 +1876,7 @@ _bdf_parse_start(char *line, unsigned in
|
|
void
|
|
bdf_setup(void)
|
|
{
|
|
- unsigned int i;
|
|
+ unsigned long i;
|
|
bdf_property_t *prop;
|
|
|
|
hash_init(&proptbl);
|
|
@@ -3199,7 +3199,7 @@ bdf_free_font(bdf_font_t *font)
|
|
void
|
|
bdf_create_property(char *name, int format)
|
|
{
|
|
- unsigned int n;
|
|
+ unsigned long n;
|
|
bdf_property_t *p;
|
|
|
|
/*
|
|
@@ -3236,7 +3236,7 @@ bdf_property_t *
|
|
bdf_get_property(char *name)
|
|
{
|
|
hashnode hn;
|
|
- unsigned int propid;
|
|
+ unsigned long propid;
|
|
|
|
if (name == 0 || *name == 0)
|
|
return 0;
|
|
@@ -3244,7 +3244,7 @@ bdf_get_property(char *name)
|
|
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;
|
|
@@ -3326,7 +3326,7 @@ void
|
|
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;
|
|
|
|
@@ -3353,7 +3353,7 @@ bdf_add_font_property(bdf_font_t *font,
|
|
* 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)
|
|
@@ -3369,7 +3369,7 @@ bdf_add_font_property(bdf_font_t *font,
|
|
/*
|
|
* 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
|
|
@@ -3426,7 +3426,7 @@ bdf_add_font_property(bdf_font_t *font,
|
|
* 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
|
|
@@ -3473,7 +3473,7 @@ bdf_add_font_property(bdf_font_t *font,
|
|
/*
|
|
* 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++;
|
|
}
|
|
@@ -3545,7 +3545,7 @@ void
|
|
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)
|
|
@@ -3554,7 +3554,7 @@ bdf_delete_font_property(bdf_font_t *fon
|
|
if ((hn = hash_lookup(name, (hashtable *) font->internal)) == 0)
|
|
return;
|
|
|
|
- off = (unsigned int) hn->data;
|
|
+ off = (unsigned long) hn->data;
|
|
p = font->props + off;
|
|
|
|
/*
|
|
@@ -3609,7 +3609,7 @@ bdf_get_font_property(bdf_font_t *font,
|
|
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 {
|
|
Index: guifile.c
|
|
===================================================================
|
|
--- guifile.c.orig
|
|
+++ guifile.c
|
|
@@ -1883,7 +1883,7 @@ load_otf_font(gbdfed_editor_t *ed, gchar
|
|
/*
|
|
* 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.
|