SF.net SVN: geany:[5899] trunk/src

colombanw at users.sourceforge.net colombanw at xxxxx
Thu Aug 25 20:12:20 UTC 2011


Revision: 5899
          http://geany.svn.sourceforge.net/geany/?rev=5899&view=rev
Author:   colombanw
Date:     2011-08-25 20:12:20 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
Use gsize instead of C99 type size_t in Geany's core

Modified Paths:
--------------
    trunk/src/editor.c
    trunk/src/editor.h
    trunk/src/prefix.c

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2011-08-25 20:11:59 UTC (rev 5898)
+++ trunk/src/editor.c	2011-08-25 20:12:20 UTC (rev 5899)
@@ -110,7 +110,7 @@
 static void auto_close_chars(ScintillaObject *sci, gint pos, gchar c);
 static void close_block(GeanyEditor *editor, gint pos);
 static void editor_highlight_braces(GeanyEditor *editor, gint cur_pos);
-static void read_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen,
+static void read_current_word(GeanyEditor *editor, gint pos, gchar *word, gsize wordlen,
 		const gchar *wc, gboolean stem);
 static gsize count_indent_size(GeanyEditor *editor, const gchar *base_indent);
 static const gchar *snippets_find_completion_by_name(const gchar *type, const gchar *name);
@@ -1609,7 +1609,7 @@
  * NULL terminated in any case, even when the word is truncated because wordlen is too small.
  * position can be -1, then the current position is used.
  * wc are the wordchars to use, if NULL, GEANY_WORDCHARS will be used */
-static void read_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen,
+static void read_current_word(GeanyEditor *editor, gint pos, gchar *word, gsize wordlen,
 		const gchar *wc, gboolean stem)
 {
 	gint line, line_start, startword, endword;
@@ -1661,7 +1661,7 @@
  * NULL terminated in any case, even when the word is truncated because wordlen is too small.
  * position can be -1, then the current position is used.
  * wc are the wordchars to use, if NULL, GEANY_WORDCHARS will be used */
-void editor_find_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen,
+void editor_find_current_word(GeanyEditor *editor, gint pos, gchar *word, gsize wordlen,
 							  const gchar *wc)
 {
 	read_current_word(editor, pos, word, wordlen, wc, FALSE);

Modified: trunk/src/editor.h
===================================================================
--- trunk/src/editor.h	2011-08-25 20:11:59 UTC (rev 5898)
+++ trunk/src/editor.h	2011-08-25 20:12:20 UTC (rev 5899)
@@ -237,7 +237,7 @@
 
 /* General editing functions */
 
-void editor_find_current_word(GeanyEditor *editor, gint pos, gchar *word, size_t wordlen,
+void editor_find_current_word(GeanyEditor *editor, gint pos, gchar *word, gsize wordlen,
 	const gchar *wc);
 
 void editor_find_current_word_sciwc(GeanyEditor *editor, gint pos, gchar *word, gsize wordlen);

Modified: trunk/src/prefix.c
===================================================================
--- trunk/src/prefix.c	2011-08-25 20:11:59 UTC (rev 5898)
+++ trunk/src/prefix.c	2011-08-25 20:12:20 UTC (rev 5899)
@@ -152,7 +152,7 @@
 		if (symbol >= (void *) start && symbol < (void *) end)
 		{
 			char *tmp;
-			size_t len;
+			gsize len;
 
 			/* Extract the filename; it is always an absolute path */
 			path = strchr (line, '/');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Commits mailing list