diff options
| author | Brent Smith <gnome@nextreality.net> | 2006-02-12 05:26:36 +0000 |
|---|---|---|
| committer | Brent Smith <bmsmith@src.gnome.org> | 2006-02-12 05:26:36 +0000 |
| commit | 891072d15655a0eb904e8071b1229b777be2c821 (patch) | |
| tree | 2986f76f5099d21c5f8b50d8c0971a20656c65ef | |
| parent | 3d7170fe64f4777ac00fc191d58494330c38efd2 (diff) | |
| download | yelp-891072d15655a0eb904e8071b1229b777be2c821.tar.gz | |
More 64-bit cleanups with gsize
2006-02-11 Brent Smith <gnome@nextreality.net>
* src/yelp-info-parser.c: (open_info_file):
* src/yelp-man-parser.c: (yelp_man_parser_parse_file),
(macro_tp_handler), (parser_handle_row_options),
(parser_parse_table):
More 64-bit cleanups with gsize
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/yelp-info-parser.c | 6 | ||||
| -rw-r--r-- | src/yelp-man-parser.c | 14 |
3 files changed, 19 insertions, 11 deletions
@@ -1,5 +1,13 @@ 2006-02-11 Brent Smith <gnome@nextreality.net> + * src/yelp-info-parser.c: (open_info_file): + * src/yelp-man-parser.c: (yelp_man_parser_parse_file), + (macro_tp_handler), (parser_handle_row_options), + (parser_parse_table): + More 64-bit cleanups with gsize + +2006-02-11 Brent Smith <gnome@nextreality.net> + * src/yelp-toc-pager.c: (toc_process_pending), (process_xslt), (process_cleanup): Small speedup achieved by only reading the TOC stylesheet once @@ -27,7 +35,7 @@ * src/yelp-base.c: (yelp_base_new): Remove some references to functions (in comments) that no longer exist. -==================== 2.13.3 ==================== +==================== 2.13.4 ==================== 2006-01-30 Shaun McCance <shaunm@gnome.org> diff --git a/src/yelp-info-parser.c b/src/yelp-info-parser.c index 8c633a15..feae831c 100644 --- a/src/yelp-info-parser.c +++ b/src/yelp-info-parser.c @@ -94,7 +94,7 @@ static char { GIOChannel *channel; int i; - int len; + gsize len; char *str; GError *error = NULL; GIOStatus result = G_IO_STATUS_NORMAL; @@ -102,14 +102,14 @@ static char d (g_print ("!! Opening %s...\n", file)); channel = yelp_io_channel_new_file (file, &error); - result = g_io_channel_read_to_end (channel, &str, (gsize *) &len, &error); + result = g_io_channel_read_to_end (channel, &str, &len, &error); if (result != G_IO_STATUS_NORMAL) { g_error ("Error reading file: %s\n", error->message); exit (666); } g_io_channel_shutdown (channel, FALSE, NULL); - for (i = 0; i < len - 1; i++) + for (i = 0; i < (len - 1); i++) { if (str[i] == '\0' && str[i+1] == '\b') { diff --git a/src/yelp-man-parser.c b/src/yelp-man-parser.c index be9e0dd8..019ce85d 100644 --- a/src/yelp-man-parser.c +++ b/src/yelp-man-parser.c @@ -74,7 +74,7 @@ struct _YelpManParser { GIOChannel *channel; /* GIOChannel for the entire document */ gchar *buffer; /* The buffer, line at a time */ - gint length; /* The buffer length */ + gsize length; /* The buffer length */ gchar *anc; /* The anchor point in the document */ gchar *cur; /* Our current position in the document */ @@ -114,7 +114,7 @@ yelp_man_parser_parse_file (YelpManParser *parser, while (g_io_channel_read_line (parser->channel, &(parser->buffer), - (gsize *) &(parser->length), + &(parser->length), NULL, errormsg) == G_IO_STATUS_NORMAL) { @@ -426,7 +426,7 @@ macro_tp_handler (YelpManParser *parser, gchar *macro, GSList *args) if (g_io_channel_read_line (parser->channel, &(parser->buffer), - (gsize *)&(parser->length), + &(parser->length), NULL, errormsg) == G_IO_STATUS_NORMAL) { parser->ins = parser_append_node (parser, "Tag"); @@ -1633,7 +1633,7 @@ parser_handle_row_options (YelpManParser *parser) } while (g_io_channel_read_line (parser->channel, &(parser->buffer), - (gsize *) &(parser->length), + &(parser->length), NULL, NULL) == G_IO_STATUS_NORMAL); } @@ -1648,7 +1648,7 @@ parser_parse_table (YelpManParser *parser) if (g_io_channel_read_line (parser->channel, &(parser->buffer), - (gsize *) &(parser->length), + &(parser->length), NULL, NULL) == G_IO_STATUS_NORMAL) { parser->anc = parser->buffer; @@ -1661,7 +1661,7 @@ parser_parse_table (YelpManParser *parser) if (g_io_channel_read_line (parser->channel, &(parser->buffer), - (gsize *) &(parser->length), + &(parser->length), NULL, NULL) == G_IO_STATUS_NORMAL) { parser->anc = parser->buffer; @@ -1677,7 +1677,7 @@ parser_parse_table (YelpManParser *parser) /* Now this is where we go through all the rows */ while (g_io_channel_read_line (parser->channel, &(parser->buffer), - (gsize *) &(parser->length), + &(parser->length), NULL, NULL) == G_IO_STATUS_NORMAL) { |