SF.net SVN: geany: [2293] trunk

[eht16 at users.sourceforge.net]

Revision: 2293
          http://geany.svn.sourceforge.net/geany/?rev=2293&view=rev
Author:   eht16
Date:     2008-02-28 08:06:04 -0800 (Thu, 28 Feb 2008)

Log Message:
-----------
Replace unsigned long in guint64 and use int instead of off_t (patch by Daniel Richard G., thanks).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/utils.c
    trunk/src/utils.h
    trunk/tagmanager/parse.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-27 16:10:41 UTC (rev 2292)
+++ trunk/ChangeLog	2008-02-28 16:06:04 UTC (rev 2293)
@@ -1,3 +1,10 @@
+2008-02-28  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/utils.c, src/utils.h, tagmanager/parse.h:
+   Replace unsigned long in guint64 and use int instead of off_t
+   (patch by Daniel Richard G., thanks).
+
+
 2008-02-27  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * plugins/*, scintilla/*, src/*, tagmanager/*:

Modified: trunk/src/utils.c
===================================================================
--- trunk/src/utils.c	2008-02-27 16:10:41 UTC (rev 2292)
+++ trunk/src/utils.c	2008-02-28 16:06:04 UTC (rev 2293)
@@ -1145,7 +1145,7 @@
 
 
 /* taken from busybox, thanks */
-gchar *utils_make_human_readable_str(unsigned long size, gulong block_size,
+gchar *utils_make_human_readable_str(guint64 size, gulong block_size,
 									 gulong display_unit)
 {
 	/* The code will adjust for additional (appended) units. */
@@ -1153,7 +1153,7 @@
 	static const gchar fmt[] = "%Lu %c%c";
 	static const gchar fmt_tenths[] = "%Lu.%d %c%c";
 
-	unsigned long val;
+	guint64 val;
 	gint frac;
 	const gchar *u;
 	const gchar *f;

Modified: trunk/src/utils.h
===================================================================
--- trunk/src/utils.h	2008-02-27 16:10:41 UTC (rev 2292)
+++ trunk/src/utils.h	2008-02-28 16:06:04 UTC (rev 2293)
@@ -114,7 +114,7 @@
 
 void utils_beep(void);
 
-gchar *utils_make_human_readable_str(unsigned long size, gulong block_size,
+gchar *utils_make_human_readable_str(guint64 size, gulong block_size,
 									 gulong display_unit);
 
 gint utils_strtod(const gchar *source, gchar **end, gboolean with_route);

Modified: trunk/tagmanager/parse.h
===================================================================
--- trunk/tagmanager/parse.h	2008-02-27 16:10:41 UTC (rev 2292)
+++ trunk/tagmanager/parse.h	2008-02-28 16:06:04 UTC (rev 2293)
@@ -15,8 +15,6 @@
 */
 #include "general.h"	/* must always come first */
 
-#include <sys/types.h>
-
 #include "parsers.h"	/* contains list of parsers */
 #include "strlist.h"
 #include "entry.h"
@@ -69,7 +67,7 @@
 typedef parserDefinition* (parserDefinitionFunc) (void);
 
 typedef struct {
-    off_t start;	/* character index in line where match starts */
+    int start;		/* character index in line where match starts */
     size_t length;	/* length of match */
 } regexMatch;
 


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