[gtkhtml] More code cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [gtkhtml] More code cleanup.
- Date: Mon, 1 Jun 2009 22:58:46 -0400 (EDT)
commit 6eb8583347dfe25dee9d2bc02e6725805fda05d0
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Jun 1 22:58:27 2009 -0400
More code cleanup.
---
gtkhtml/gtkhtml-stream.c | 6 +++---
gtkhtml/gtkhtml-stream.h | 2 +-
gtkhtml/gtkhtml-types.h | 4 ++--
gtkhtml/gtkhtml.c | 8 ++++----
gtkhtml/gtkhtml.h | 2 +-
gtkhtml/gtkhtmldebug.c | 4 ++--
gtkhtml/htmlclueflow.c | 4 ++--
gtkhtml/htmlembedded.c | 4 ++--
gtkhtml/htmlengine-search.c | 2 +-
gtkhtml/htmlengine.c | 14 +++++++-------
gtkhtml/htmlentity.c | 12 ++++++------
gtkhtml/htmlimage.c | 2 +-
gtkhtml/htmlobject.c | 8 ++++----
gtkhtml/htmlpainter.c | 10 +++++-----
gtkhtml/htmltext.c | 4 ++--
gtkhtml/htmltextslave.c | 6 +++---
gtkhtml/htmltokenizer.c | 14 +++++++-------
gtkhtml/htmltokenizer.h | 4 ++--
gtkhtml/test-stress.c | 18 +++++++++---------
gtkhtml/test-suite.c | 12 ++++++------
gtkhtml/test.c | 4 ++--
gtkhtml/testgtkhtml.c | 4 ++--
22 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/gtkhtml/gtkhtml-stream.c b/gtkhtml/gtkhtml-stream.c
index 6d64b04..e7e13ac 100644
--- a/gtkhtml/gtkhtml-stream.c
+++ b/gtkhtml/gtkhtml-stream.c
@@ -69,7 +69,7 @@ gtk_html_stream_destroy (GtkHTMLStream *stream)
void
gtk_html_stream_write (GtkHTMLStream *stream,
const gchar *buffer,
- size_t size)
+ gsize size)
{
g_return_if_fail (stream != NULL);
g_return_if_fail (buffer != NULL);
@@ -84,7 +84,7 @@ gtk_html_stream_vprintf (GtkHTMLStream *stream,
const gchar *format,
va_list ap)
{
- size_t len;
+ gsize len;
gchar *buf = NULL;
gchar *mbuf = NULL;
gchar *result_string = NULL;
@@ -166,7 +166,7 @@ stream_log_types (GtkHTMLStream *stream,
static void
stream_log_write (GtkHTMLStream *stream,
const gchar *buffer,
- size_t size,
+ gsize size,
gpointer user_data)
{
GtkHTMLLog *log = user_data;
diff --git a/gtkhtml/gtkhtml-stream.h b/gtkhtml/gtkhtml-stream.h
index a0c1837..ffcc70e 100644
--- a/gtkhtml/gtkhtml-stream.h
+++ b/gtkhtml/gtkhtml-stream.h
@@ -40,7 +40,7 @@ GtkHTMLStream *gtk_html_stream_new (GtkHTML *html,
gpointer user_data);
void gtk_html_stream_write (GtkHTMLStream *stream,
const gchar *buffer,
- size_t size);
+ gsize size);
void gtk_html_stream_destroy (GtkHTMLStream *stream);
void gtk_html_stream_close (GtkHTMLStream *stream,
GtkHTMLStreamStatus status);
diff --git a/gtkhtml/gtkhtml-types.h b/gtkhtml/gtkhtml-types.h
index 63e539f..c8d5c65 100644
--- a/gtkhtml/gtkhtml-types.h
+++ b/gtkhtml/gtkhtml-types.h
@@ -43,13 +43,13 @@ typedef void (* GtkHTMLStreamCloseFunc) (GtkHTMLStream *stream,
gpointer user_data);
typedef void (* GtkHTMLStreamWriteFunc) (GtkHTMLStream *stream,
const gchar *buffer,
- size_t size,
+ gsize size,
gpointer user_data);
/* FIXME 1st param should be Engine */
typedef gboolean (* GtkHTMLSaveReceiverFn) (gpointer engine,
const gchar *data,
- size_t len,
+ gsize len,
gpointer user_data);
typedef gint (*GtkHTMLPrintCalcHeight) (GtkHTML *html,
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index bbf5c72..8d8e553 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -1556,7 +1556,7 @@ skip_host (const gchar *url)
return url;
}
-static size_t
+static gsize
path_len (const gchar *base, gboolean absolute)
{
const gchar *last;
@@ -1581,7 +1581,7 @@ collapse_path (gchar *url)
gchar *start;
gchar *end;
gchar *cur;
- size_t len;
+ gsize len;
start = skip_host (url);
@@ -1639,7 +1639,7 @@ static gchar *
expand_relative (const gchar *base, const gchar *url)
{
gchar *new_url = NULL;
- size_t base_len, url_len;
+ gsize base_len, url_len;
gboolean absolute = FALSE;
if (!base || url_is_absolute (url)) {
@@ -3720,7 +3720,7 @@ void
gtk_html_write (GtkHTML *html,
GtkHTMLStream *handle,
const gchar *buffer,
- size_t size)
+ gsize size)
{
gtk_html_stream_write (handle, buffer, size);
}
diff --git a/gtkhtml/gtkhtml.h b/gtkhtml/gtkhtml.h
index c8a504b..8aa34cd 100644
--- a/gtkhtml/gtkhtml.h
+++ b/gtkhtml/gtkhtml.h
@@ -164,7 +164,7 @@ GtkHTMLStream *gtk_html_begin_full (GtkHTML
void gtk_html_write (GtkHTML *html,
GtkHTMLStream *handle,
const gchar *buffer,
- size_t size);
+ gsize size);
void gtk_html_end (GtkHTML *html,
GtkHTMLStream *handle,
GtkHTMLStreamStatus status);
diff --git a/gtkhtml/gtkhtmldebug.c b/gtkhtml/gtkhtmldebug.c
index 06418cd..0433e25 100644
--- a/gtkhtml/gtkhtmldebug.c
+++ b/gtkhtml/gtkhtmldebug.c
@@ -200,7 +200,7 @@ gtk_html_debug_dump_object (HTMLObject *obj,
}
- g_print ("total width by glyph string extents (in engine units): %d\n", (int)(0.5 + width / PANGO_SCALE));
+ g_print ("total width by glyph string extents (in engine units): %d\n", (gint)(0.5 + width / PANGO_SCALE));
ii = html_text_get_item_index (HTML_TEXT_SLAVE (obj)->owner, NULL, HTML_TEXT_SLAVE (obj)->posStart, &io);
tw = 0;
@@ -212,7 +212,7 @@ gtk_html_debug_dump_object (HTMLObject *obj,
offset ++;
}
- g_print ("\ntotal width by widths in entries (in engine units): %d", (int)(0.5 + tw / PANGO_SCALE));
+ g_print ("\ntotal width by widths in entries (in engine units): %d", (gint)(0.5 + tw / PANGO_SCALE));
}
g_print ("\n");
diff --git a/gtkhtml/htmlclueflow.c b/gtkhtml/htmlclueflow.c
index 536559e..cc73c4c 100644
--- a/gtkhtml/htmlclueflow.c
+++ b/gtkhtml/htmlclueflow.c
@@ -693,7 +693,7 @@ pref_left_margin (HTMLPainter *p, HTMLObject *o, gint indent)
if (html_object_get_direction (o) == HTML_DIRECTION_RTL) {
if (HTML_CLUEFLOW (o)->style != HTML_CLUEFLOW_STYLE_PRE && HTML_IS_PLAIN_PAINTER(p))
- return MAX (margin, o->width - (int)(72 * (MAX (html_painter_get_space_width (p, GTK_HTML_FONT_STYLE_SIZE_3 | GTK_HTML_FONT_STYLE_FIXED, NULL),
+ return MAX (margin, o->width - (gint)(72 * (MAX (html_painter_get_space_width (p, GTK_HTML_FONT_STYLE_SIZE_3 | GTK_HTML_FONT_STYLE_FIXED, NULL),
html_painter_get_e_width (p, GTK_HTML_FONT_STYLE_SIZE_3 | GTK_HTML_FONT_STYLE_FIXED, NULL)))));
} else {
if (indent > margin)
@@ -1598,7 +1598,7 @@ get_end_indent_item (HTMLListType type)
return "";
}
-static int
+static gint
get_similar_depth (HTMLClueFlow *self, HTMLClueFlow *neighbor)
{
gint i;
diff --git a/gtkhtml/htmlembedded.c b/gtkhtml/htmlembedded.c
index 5dfd48a..9cc6957 100644
--- a/gtkhtml/htmlembedded.c
+++ b/gtkhtml/htmlembedded.c
@@ -251,7 +251,7 @@ html_embedded_encode_string (const gchar *before, const gchar *codepage)
while ( pos < strlen(str) ) {
- c = (unsigned char) str[pos];
+ c = (guchar) str[pos];
if ( (( c >= 'A') && ( c <= 'Z')) ||
(( c >= 'a') && ( c <= 'z')) ||
@@ -271,7 +271,7 @@ html_embedded_encode_string (const gchar *before, const gchar *codepage)
}
else if ( c != '\r' )
{
- sprintf( buffer, "%%%02X", (int)c );
+ sprintf( buffer, "%%%02X", (gint)c );
encoded = g_string_append (encoded, buffer);
}
pos++;
diff --git a/gtkhtml/htmlengine-search.c b/gtkhtml/htmlengine-search.c
index 424ac33..440d0a4 100644
--- a/gtkhtml/htmlengine-search.c
+++ b/gtkhtml/htmlengine-search.c
@@ -189,7 +189,7 @@ html_engine_search_next_int (HTMLEngine *e)
retval = html_object_search (HTML_OBJECT (info->stack->data), info);
else {
html_search_push (info, e->clue);
- retval = e->clue ? html_object_search (e->clue, info) : FALSE ;
+ retval = e->clue ? html_object_search (e->clue, info) : FALSE;
}
if (retval)
display_search_results (info);
diff --git a/gtkhtml/htmlengine.c b/gtkhtml/htmlengine.c
index 57205ef..bd32690 100644
--- a/gtkhtml/htmlengine.c
+++ b/gtkhtml/htmlengine.c
@@ -114,7 +114,7 @@ static gchar ** html_engine_stream_types (GtkHTMLStream *stream,
gpointer data);
static void html_engine_stream_write (GtkHTMLStream *stream,
const gchar *buffer,
- size_t size,
+ gsize size,
gpointer data);
static void html_engine_stream_end (GtkHTMLStream *stream,
GtkHTMLStreamStatus status,
@@ -159,9 +159,9 @@ enum {
static guint signals [LAST_SIGNAL] = { 0 };
#define TIMER_INTERVAL 300
-#define DT(x) ;
-#define DF(x) ;
-#define DE(x) ;
+#define DT(x);
+#define DF(x);
+#define DE(x);
#define ID_A "a"
#define ID_ADDRESS "address"
@@ -909,7 +909,7 @@ insert_text (HTMLEngine *e,
gboolean create_link;
gint last_pos = 0;
gint last_bytes = 0;
- gboolean prev_text_ends_in_space = FALSE ;
+ gboolean prev_text_ends_in_space = FALSE;
g_return_if_fail (HTML_IS_ENGINE (e));
@@ -939,7 +939,7 @@ insert_text (HTMLEngine *e,
if (HTML_IS_TEXT (prev))
if (HTML_TEXT (prev)->text_bytes > 0)
if (' ' == (HTML_TEXT (prev)->text)[HTML_TEXT (prev)->text_bytes - 1])
- prev_text_ends_in_space = TRUE ;
+ prev_text_ends_in_space = TRUE;
if (e->flow == NULL && e->editable) {
/* Preserve one leading space. */
@@ -4719,7 +4719,7 @@ html_engine_stream_types (GtkHTMLStream *handle,
static void
html_engine_stream_write (GtkHTMLStream *handle,
const gchar *buffer,
- size_t size,
+ gsize size,
gpointer data)
{
HTMLEngine *e;
diff --git a/gtkhtml/htmlentity.c b/gtkhtml/htmlentity.c
index fd0c543..3b06020 100644
--- a/gtkhtml/htmlentity.c
+++ b/gtkhtml/htmlentity.c
@@ -83,7 +83,7 @@ __inline
inline
#endif
#endif
-static unsigned int
+static guint
hash (register const gchar *str, register guint len)
{
static unsigned short asso_values[] =
@@ -120,20 +120,20 @@ hash (register const gchar *str, register guint len)
switch (hval)
{
default:
- hval += asso_values[(unsigned char)str[4]];
+ hval += asso_values[(guchar)str[4]];
/*FALLTHROUGH*/
case 4:
case 3:
- hval += asso_values[(unsigned char)str[2]];
+ hval += asso_values[(guchar)str[2]];
/*FALLTHROUGH*/
case 2:
- hval += asso_values[(unsigned char)str[1]+1];
+ hval += asso_values[(guchar)str[1]+1];
/*FALLTHROUGH*/
case 1:
- hval += asso_values[(unsigned char)str[0]];
+ hval += asso_values[(guchar)str[0]];
break;
}
- return hval + asso_values[(unsigned char)str[len - 1]];
+ return hval + asso_values[(guchar)str[len - 1]];
}
#ifdef __GNUC__
diff --git a/gtkhtml/htmlimage.c b/gtkhtml/htmlimage.c
index 0e9f7cf..cf7d3a7 100644
--- a/gtkhtml/htmlimage.c
+++ b/gtkhtml/htmlimage.c
@@ -1141,7 +1141,7 @@ html_image_factory_end_pixbuf (GtkHTMLStream *stream,
static void
html_image_factory_write_pixbuf (GtkHTMLStream *stream,
const gchar *buffer,
- size_t size,
+ gsize size,
gpointer user_data)
{
HTMLImagePointer *p = user_data;
diff --git a/gtkhtml/htmlobject.c b/gtkhtml/htmlobject.c
index b7eae3c..13eaa19 100644
--- a/gtkhtml/htmlobject.c
+++ b/gtkhtml/htmlobject.c
@@ -736,13 +736,13 @@ html_object_real_backspace (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *en
return TRUE;
}
-static int
+static gint
html_object_real_get_right_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offset)
{
return html_object_get_length (o);
}
-static int
+static gint
html_object_real_get_left_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offset)
{
return 0;
@@ -1800,7 +1800,7 @@ html_object_set_data_nocp (HTMLObject *object, const gchar *key, const gchar *va
void
html_object_set_data_full_nocp (HTMLObject *object, const gchar *key, gconstpointer value, GDestroyNotify func)
{
- g_datalist_set_data_full (&object->object_data_nocp, key, value, func);
+ g_datalist_set_data_full (&object->object_data_nocp, key, (gpointer) value, func);
}
gpointer
@@ -1818,7 +1818,7 @@ html_object_set_data (HTMLObject *object, const gchar *key, const gchar *value)
void
html_object_set_data_full (HTMLObject *object, const gchar *key, gconstpointer value, GDestroyNotify func)
{
- g_datalist_set_data_full (&object->object_data, key, value, func);
+ g_datalist_set_data_full (&object->object_data, key, (gpointer) value, func);
}
gpointer
diff --git a/gtkhtml/htmlpainter.c b/gtkhtml/htmlpainter.c
index b522c39..4066926 100644
--- a/gtkhtml/htmlpainter.c
+++ b/gtkhtml/htmlpainter.c
@@ -389,7 +389,7 @@ get_font_info (HTMLPainter *painter,
}
-static int
+static gint
get_space_width (HTMLPainter *painter,
HTMLTextPangoInfo *pi)
{
@@ -529,7 +529,7 @@ html_replace_tabs (const gchar *text, gchar *translated, guint bytes)
tt = translated;
do {
- tab = memchr (t, (unsigned char) '\t', bytes - (t - text));
+ tab = memchr (t, (guchar) '\t', bytes - (t - text));
if (tab) {
strncpy (tt, t, tab - t);
tt += tab - t;
@@ -580,7 +580,7 @@ html_painter_draw_entries (HTMLPainter *painter, gint x, gint y,
c_text = text;
bytes = g_utf8_offset_to_pointer (text, len) - text;
gl = glyphs;
- tab = memchr (c_text, (unsigned char) '\t', bytes);
+ tab = memchr (c_text, (guchar) '\t', bytes);
/* We iterate through the string by tabs and non-tab segments, skipping over
* the tabs and drawing the non-tab segments.
@@ -616,7 +616,7 @@ html_painter_draw_entries (HTMLPainter *painter, gint x, gint y,
line_offset += 8 - (line_offset % 8);
}
- tab = memchr (c_text + 1, (unsigned char) '\t', bytes - 1);
+ tab = memchr (c_text + 1, (guchar) '\t', bytes - 1);
} else {
x += html_painter_pango_to_engine (painter, (* HP_CLASS (painter)->draw_glyphs) (painter, x, y, item, gl->data, NULL, NULL));
@@ -915,7 +915,7 @@ guint
html_painter_get_block_cite_width (HTMLPainter *painter, GtkHTMLFontStyle style, HTMLFontFace *face, HTMLDirection dir)
{
HTMLFont *font = html_font_manager_get_font (&painter->font_manager, face, style);
- return dir == HTML_DIRECTION_RTL ? font->cite_width_rtl : font->cite_width_ltr ;
+ return dir == HTML_DIRECTION_RTL ? font->cite_width_rtl : font->cite_width_ltr;
}
guint
diff --git a/gtkhtml/htmltext.c b/gtkhtml/htmltext.c
index 4c4e885..a68be99 100644
--- a/gtkhtml/htmltext.c
+++ b/gtkhtml/htmltext.c
@@ -2793,7 +2793,7 @@ html_text_backspace (HTMLObject *self, HTMLCursor *cursor, HTMLEngine *engine)
return retval;
}
-static int
+static gint
html_text_get_right_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offset)
{
HTMLTextSlave *slave = html_text_get_slave_at_offset (HTML_TEXT (o), NULL, offset);
@@ -2807,7 +2807,7 @@ html_text_get_right_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offse
}
}
-static int
+static gint
html_text_get_left_edge_offset (HTMLObject *o, HTMLPainter *painter, gint offset)
{
HTMLTextSlave *slave = html_text_get_slave_at_offset (HTML_TEXT (o), NULL, offset);
diff --git a/gtkhtml/htmltextslave.c b/gtkhtml/htmltextslave.c
index 7e91bc6..bbda4a0 100644
--- a/gtkhtml/htmltextslave.c
+++ b/gtkhtml/htmltextslave.c
@@ -113,7 +113,7 @@ hts_update_asc_dsc (HTMLPainter *painter, PangoItem *item, gint *asc, gint *dsc)
pango_font_metrics_unref (pfm);
}
-static int
+static gint
hts_calc_width (HTMLTextSlave *slave, HTMLPainter *painter, gint *asc, gint *dsc)
{
/*HTMLText *text = slave->owner;
@@ -493,7 +493,7 @@ html_get_glyphs_non_tab (GList *glyphs, PangoItem *item, gint ii, const gchar *t
{
gchar *tab;
- while ((tab = memchr (text, (unsigned char) '\t', bytes))) {
+ while ((tab = memchr (text, (guchar) '\t', bytes))) {
gint c_bytes = tab - text;
if (c_bytes > 0)
glyphs = get_glyphs_base_text (glyphs, item, ii, text, c_bytes);
@@ -1461,7 +1461,7 @@ html_text_slave_get_cursor_base (HTMLTextSlave *slave, HTMLPainter *painter, gui
html_object_calc_abs_position (HTML_OBJECT (slave), x, y);
- gi = html_text_slave_get_glyph_item_at_offset (slave, painter, (int) offset, NULL, NULL, &start_width, &index);
+ gi = html_text_slave_get_glyph_item_at_offset (slave, painter, (gint) offset, NULL, NULL, &start_width, &index);
/* printf ("gi: %p index: %d start_width: %d item indexes %d %d\n", */
/* gi, index, start_width, gi ? gi->glyph_item.item->offset : -1, */
diff --git a/gtkhtml/htmltokenizer.c b/gtkhtml/htmltokenizer.c
index d759b24..00a3a20 100644
--- a/gtkhtml/htmltokenizer.c
+++ b/gtkhtml/htmltokenizer.c
@@ -153,7 +153,7 @@ static void html_tokenizer_finalize (GObject *);
static void html_tokenizer_real_change (HTMLTokenizer *, const gchar *content_type);
static void html_tokenizer_real_begin (HTMLTokenizer *, const gchar *content_type);
static void html_tokenizer_real_engine_type (HTMLTokenizer *t, gboolean engine_type);
-static void html_tokenizer_real_write (HTMLTokenizer *, const gchar *str, size_t size);
+static void html_tokenizer_real_write (HTMLTokenizer *, const gchar *str, gsize size);
static void html_tokenizer_real_end (HTMLTokenizer *);
static const gchar *
html_tokenizer_real_get_content_type(HTMLTokenizer *);
@@ -459,7 +459,7 @@ html_tokenizer_convert_entity (gchar *token)
write_pos = resulted;
read_pos = token;
while (read_pos < full_pos) {
- size_t count_chars = strcspn (read_pos, "&");
+ gsize count_chars = strcspn (read_pos, "&");
memcpy (write_pos, read_pos, count_chars);
write_pos += count_chars;
read_pos += count_chars;
@@ -512,12 +512,12 @@ gchar *
convert_text_encoding (const GIConv iconv_cd,
const gchar *token)
{
- size_t currlength;
+ gsize currlength;
gchar *newbuffer;
gchar *returnbuffer;
const gchar *current;
- size_t newlength;
- size_t oldlength;
+ gsize newlength;
+ gsize oldlength;
if (token == NULL)
return NULL;
@@ -1421,7 +1421,7 @@ html_tokenizer_tokenize_one_char (HTMLTokenizer *t, const gchar **src)
}
static void
-html_tokenizer_real_write (HTMLTokenizer *t, const gchar *string, size_t size)
+html_tokenizer_real_write (HTMLTokenizer *t, const gchar *string, gsize size)
{
const gchar *src = string;
@@ -1504,7 +1504,7 @@ html_tokenizer_end (HTMLTokenizer *t)
}
void
-html_tokenizer_write (HTMLTokenizer *t, const gchar *str, size_t size)
+html_tokenizer_write (HTMLTokenizer *t, const gchar *str, gsize size)
{
HTMLTokenizerClass *klass;
diff --git a/gtkhtml/htmltokenizer.h b/gtkhtml/htmltokenizer.h
index 6fb2ff4..2e28aeb 100644
--- a/gtkhtml/htmltokenizer.h
+++ b/gtkhtml/htmltokenizer.h
@@ -54,7 +54,7 @@ struct _HTMLTokenizerClass {
void (*end) (HTMLTokenizer *);
/* virtual functions */
- void (*write) (HTMLTokenizer *, const gchar *string, size_t size);
+ void (*write) (HTMLTokenizer *, const gchar *string, gsize size);
gchar *(*peek_token) (HTMLTokenizer *);
gchar *(*next_token) (HTMLTokenizer *);
const gchar *(*get_content_type) (HTMLTokenizer *);
@@ -83,7 +83,7 @@ gboolean html_tokenizer_get_engine_type (HTMLTokenizer *t);
void html_tokenizer_write (HTMLTokenizer *t,
const gchar *string,
- size_t size);
+ gsize size);
void html_tokenizer_end (HTMLTokenizer *t);
gchar * html_tokenizer_peek_token (HTMLTokenizer *t);
gchar * html_tokenizer_next_token (HTMLTokenizer *t);
diff --git a/gtkhtml/test-stress.c b/gtkhtml/test-stress.c
index 0816b3a..8a3f09f 100644
--- a/gtkhtml/test-stress.c
+++ b/gtkhtml/test-stress.c
@@ -87,11 +87,11 @@ static gint test_level_1 (GtkHTML *html)
srand (2);
for (i = 0; i < 200; i ++) {
- gint j, len = 1 + (int) (10.0*rand()/(RAND_MAX+1.0));
+ gint j, len = 1 + (gint) (10.0*rand()/(RAND_MAX+1.0));
gchar word [12];
for (j = 0; j < len; j ++)
- word [j] = 'a' + (int) (26.0*rand()/(RAND_MAX+1.0));
+ word [j] = 'a' + (gint) (26.0*rand()/(RAND_MAX+1.0));
word [len] = ' ';
word [len + 1] = 0;
total_len += len + 1;
@@ -108,12 +108,12 @@ static gint test_level_1 (GtkHTML *html)
for (i = 0; i < 1000; i ++) {
gint j, new_pos, pos, len;
- len = 1 + (int) (120.0*rand()/(RAND_MAX+1.0));
- pos = MAX (0, (int) (((double) (total_len - len))*rand()/(RAND_MAX+1.0)));
+ len = 1 + (gint) (120.0*rand()/(RAND_MAX+1.0));
+ pos = MAX (0, (gint) (((double) (total_len - len))*rand()/(RAND_MAX+1.0)));
printf ("step: %d pos: %d len: %d\n", i, pos, len);
- switch ((int) (10.0*rand()/(RAND_MAX+1.0))) {
+ switch ((gint) (10.0*rand()/(RAND_MAX+1.0))) {
case 0:
/* cut'n'paste */
printf ("cut'n'paste\n");
@@ -122,7 +122,7 @@ static gint test_level_1 (GtkHTML *html)
html_cursor_jump_to_position (html->engine->cursor, html->engine, pos + len);
html_engine_cut (html->engine);
- new_pos = (int) (((double) (total_len - len))*rand()/(RAND_MAX+1.0));
+ new_pos = (gint) (((double) (total_len - len))*rand()/(RAND_MAX+1.0));
html_cursor_jump_to_position (html->engine->cursor, html->engine, new_pos);
html_engine_paste (html->engine);
@@ -132,7 +132,7 @@ static gint test_level_1 (GtkHTML *html)
printf ("insert text\n");
html_cursor_jump_to_position (html->engine->cursor, html->engine, pos);
for (j = 0; j < len; j ++) {
- gint et = (int) (10.0*rand()/(RAND_MAX+1.0));
+ gint et = (gint) (10.0*rand()/(RAND_MAX+1.0));
if (et == 0)
gtk_html_command (html, "insert-tab");
else {
@@ -141,7 +141,7 @@ static gint test_level_1 (GtkHTML *html)
if (et == 1)
ch [0] = ' ';
else
- ch [0] = 'a' + (int) (26.0*rand()/(RAND_MAX+1.0));
+ ch [0] = 'a' + (gint) (26.0*rand()/(RAND_MAX+1.0));
ch [1] = 0;
html_engine_insert_text (html->engine, ch, 1);
}
@@ -179,7 +179,7 @@ static gint test_level_1 (GtkHTML *html)
html_cursor_jump_to_position (html->engine->cursor, html->engine, pos + len);
gtk_html_cut (html);
- new_pos = (int) (((double) (total_len - len))*rand()/(RAND_MAX+1.0));
+ new_pos = (gint) (((double) (total_len - len))*rand()/(RAND_MAX+1.0));
html_cursor_jump_to_position (html->engine->cursor, html->engine, new_pos);
gtk_html_paste (html, TRUE);
diff --git a/gtkhtml/test-suite.c b/gtkhtml/test-suite.c
index d1334fc..f189ac0 100644
--- a/gtkhtml/test-suite.c
+++ b/gtkhtml/test-suite.c
@@ -75,7 +75,7 @@ static void load_editable (GtkHTML *html, const gchar *s)
}
static gboolean
-plain_save_receiver (gpointer engine, const gchar *data, size_t len, gpointer user_data)
+plain_save_receiver (gpointer engine, const gchar *data, gsize len, gpointer user_data)
{
GString *str = (GString *) user_data;
@@ -521,7 +521,7 @@ static gint test_cursor_beol_rtl (GtkHTML *html)
return TRUE;
}
-static int
+static gint
test_quotes_in_div_block (GtkHTML *html)
{
GByteArray *flow_levels;
@@ -549,7 +549,7 @@ test_quotes_in_div_block (GtkHTML *html)
return TRUE;
}
-static int
+static gint
test_quotes_in_table (GtkHTML *html)
{
GByteArray *flow_levels;
@@ -585,7 +585,7 @@ test_quotes_in_table (GtkHTML *html)
return TRUE;
}
-static int
+static gint
test_capitalize_upcase_lowcase_word (GtkHTML *html)
{
HTMLObject *text_object;
@@ -648,7 +648,7 @@ test_capitalize_upcase_lowcase_word (GtkHTML *html)
return TRUE;
}
-static int
+static gint
test_delete_around_table (GtkHTML *html)
{
load_editable (html, "<table><tr><td></td></tr></table><br>abc");
@@ -674,7 +674,7 @@ test_delete_around_table (GtkHTML *html)
return TRUE;
}
-static int
+static gint
test_table_cell_parsing (GtkHTML *html)
{
load_editable (html, "<table><tr><td></td></tr></table>");
diff --git a/gtkhtml/test.c b/gtkhtml/test.c
index 2598b37..8de35aa 100644
--- a/gtkhtml/test.c
+++ b/gtkhtml/test.c
@@ -71,7 +71,7 @@ url_requested (GtkHTML *unused, const gchar *url, GtkHTMLStream *stream, gpointe
if (fd != -1) {
#define MY_BUF_SIZE 32768
gchar *buf;
- size_t size;
+ gsize size;
buf = alloca (MY_BUF_SIZE);
while ((size = read (fd, buf, MY_BUF_SIZE)) > 0) {
@@ -179,7 +179,7 @@ print_cb (GtkWidget *widget, gpointer data)
/* We want to sort "a2" < "b1" < "B1" < "b2" < "b12". Vastly
* overengineered
*/
-static int
+static gint
compare_examples (gconstpointer a,
gconstpointer b)
{
diff --git a/gtkhtml/testgtkhtml.c b/gtkhtml/testgtkhtml.c
index 5d42430..b3bee1d 100644
--- a/gtkhtml/testgtkhtml.c
+++ b/gtkhtml/testgtkhtml.c
@@ -520,7 +520,7 @@ load_done (GtkHTML *html)
gtk_main_quit(); */
}
-static int
+static gint
on_button_press_event (GtkWidget *widget, GdkEventButton *event)
{
GtkMenu *menu;
@@ -618,7 +618,7 @@ on_link_clicked (GtkHTML *html, const gchar *url, gpointer data)
}
/* simulate an async object isntantiation */
-static int
+static gint
object_timeout(GtkHTMLEmbedded *eb)
{
GtkWidget *w;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
