[Gnucash-changes] r12928 - gnucash/trunk - Thomas Klausner's NetBSD
patch.
Derek Atkins
warlord at cvs.gnucash.org
Sat Jan 21 19:27:12 EST 2006
Author: warlord
Date: 2006-01-21 19:27:11 -0500 (Sat, 21 Jan 2006)
New Revision: 12928
Trac: http://svn.gnucash.org/trac/changeset/12928
Modified:
gnucash/trunk/ChangeLog
gnucash/trunk/doc/Makefile.am
gnucash/trunk/lib/libqof/qof/gnc-date.c
gnucash/trunk/lib/libqof/qof/gnc-engine-util.c
gnucash/trunk/lib/libqof/qof/gnc-engine-util.h
gnucash/trunk/lib/libqof/qof/guid.c
gnucash/trunk/src/app-utils/gnc-ui-util.c
gnucash/trunk/src/app-utils/gnc-ui-util.h
gnucash/trunk/src/backend/file/io-example-account.c
gnucash/trunk/src/backend/file/sixtp-utils.c
gnucash/trunk/src/backend/file/sixtp.c
gnucash/trunk/src/calculation/expression_parser.c
gnucash/trunk/src/gnome-utils/gnc-date-edit.c
gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c
Log:
Thomas Klausner's NetBSD patch.
Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/ChangeLog 2006-01-22 00:27:11 UTC (rev 12928)
@@ -9,6 +9,21 @@
* src/app-utils/prefs.scm: replace an API needed by old scheme
config files. It was removed in r11565. Replace it now.
+ * src/backend/file/io-example-account.c
+ * src/backend/file/sixtp-utils.c
+ * src/backend/file/sixtp.c
+ * src/calculation/expression_parser.c
+ * src/gnome-utils/gnc-date-edit.c
+ * src/gnome-utils/gnc-menu-extensions.c
+ * src/app-utils/gnc-ui-util.h
+ * src/app-utils/gnc-ui-util.c
+ * doc/Makefile.am
+ * lib/libqof/qof/guid.c
+ * lib/libqof/qof/gnc-date.c
+ * lib/libqof/qof/gnc-engine-util.c
+ * lib/libqof/qof/gnc-engine-util.h
+ Thomas Klausner's NetBSD patch.
+
2006-01-21 David Hampton <hampton at employees.org>
* src/gnome-utils/*.glade: Move glade files to a new subdirectory.
Modified: gnucash/trunk/doc/Makefile.am
===================================================================
--- gnucash/trunk/doc/Makefile.am 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/doc/Makefile.am 2006-01-22 00:27:11 UTC (rev 12928)
@@ -55,7 +55,7 @@
tip_of_the_day.list: tip_of_the_day.list.in Makefile
gcc -E -P -x c -D'N_(x)=x' -o $@.tmp $<
- cat -s $@.tmp | ${SED} -e 's/^ *\"\(.*\)\" *$$/\1/m' > $@
+ cat -s $@.tmp | ${SED} -e 's/^ *\"\(.*\)\" *$$/\1/' > $@
rm -f $@.tmp
DISTCLEANFILES = gnc-prices.1 gnucash.1 tip_of_the_day.list
Modified: gnucash/trunk/lib/libqof/qof/gnc-date.c
===================================================================
--- gnucash/trunk/lib/libqof/qof/gnc-date.c 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/lib/libqof/qof/gnc-date.c 2006-01-22 00:27:11 UTC (rev 12928)
@@ -934,10 +934,10 @@
return locale_separator;
else
{ /* Make a guess */
- char string[256];
+ unsigned char string[256];
struct tm *tm;
time_t secs;
- char *s;
+ unsigned char *s;
secs = time(NULL);
tm = localtime(&secs);
@@ -1055,7 +1055,7 @@
str +=3;
if ('.' == *str) str++;
- if (isdigit (*str) && isdigit (*(str+1)))
+ if (isdigit ((unsigned char)*str) && isdigit ((unsigned char)*(str+1)))
{
int cyn;
/* copy sign from hour part */
Modified: gnucash/trunk/lib/libqof/qof/gnc-engine-util.c
===================================================================
--- gnucash/trunk/lib/libqof/qof/gnc-engine-util.c 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/lib/libqof/qof/gnc-engine-util.c 2006-01-22 00:27:11 UTC (rev 12928)
@@ -40,7 +40,7 @@
/* Search for str2 in first nchar chars of str1, ignore case.. Return
* pointer to first match, or null. */
char *
-strncasestr(const char *str1, const char *str2, size_t len)
+strncasestr(const unsigned char *str1, const unsigned char *str2, size_t len)
{
while (*str1 && len--)
{
@@ -145,7 +145,7 @@
\********************************************************************/
gboolean
-gnc_strisnum(const char *s)
+gnc_strisnum(const unsigned char *s)
{
if (s == NULL) return FALSE;
if (*s == 0) return FALSE;
Modified: gnucash/trunk/lib/libqof/qof/gnc-engine-util.h
===================================================================
--- gnucash/trunk/lib/libqof/qof/gnc-engine-util.h 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/lib/libqof/qof/gnc-engine-util.h 2006-01-22 00:27:11 UTC (rev 12928)
@@ -226,7 +226,7 @@
/** Search for str2 in first nchar chars of str1, ignore case. Return
* pointer to first match, or null. These are just like that strnstr
* and the strstr functions, except that they ignore the case. */
-extern char *strncasestr(const char *str1, const char *str2, size_t len);
+extern char *strncasestr(const unsigned char *str1, const unsigned char *str2, size_t len);
extern char *strcasestr(const char *str1, const char *str2);
/** The ultostr() subroutine is the inverse of strtoul(). It accepts a
@@ -236,7 +236,7 @@
/** Returns true if string s is a number, possibly surrounded by
* whitespace. */
-gboolean gnc_strisnum(const char *s);
+gboolean gnc_strisnum(const unsigned char *s);
/** Local copy of stpcpy, used wtih libc's that don't have one. */
char * gnc_stpcpy (char *dest, const char *src);
Modified: gnucash/trunk/lib/libqof/qof/guid.c
===================================================================
--- gnucash/trunk/lib/libqof/qof/guid.c 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/lib/libqof/qof/guid.c 2006-01-22 00:27:11 UTC (rev 12928)
@@ -548,11 +548,11 @@
* a hex number. returns false otherwise. Decoded number
* is packed into data in little endian order. */
static gboolean
-decode_md5_string(const char *string, unsigned char *data)
+decode_md5_string(const unsigned char *string, unsigned char *data)
{
unsigned char n1, n2;
size_t count = -1;
- char c1, c2;
+ unsigned char c1, c2;
if (NULL == data) return FALSE;
if (NULL == string) goto badstring;
Modified: gnucash/trunk/src/app-utils/gnc-ui-util.c
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.c 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.c 2006-01-22 00:27:11 UTC (rev 12928)
@@ -1586,8 +1586,8 @@
gboolean
xaccParseAmountExtended (const char * in_str, gboolean monetary,
- char negative_sign, char decimal_point,
- char group_separator, char *group, char *ignore_list,
+ char negative_sign, unsigned char decimal_point,
+ unsigned char group_separator, char *group, char *ignore_list,
gnc_numeric *result, char **endstr)
{
gboolean is_negative;
@@ -1600,7 +1600,7 @@
ParseState state;
- const char *in;
+ const unsigned char *in;
char *out_str;
char *out;
Modified: gnucash/trunk/src/app-utils/gnc-ui-util.h
===================================================================
--- gnucash/trunk/src/app-utils/gnc-ui-util.h 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/src/app-utils/gnc-ui-util.h 2006-01-22 00:27:11 UTC (rev 12928)
@@ -327,8 +327,8 @@
*/
gboolean
xaccParseAmountExtended (const char * in_str, gboolean monetary,
- char negative_sign, char decimal_point,
- char group_separator, char *group, char *ignore_list,
+ char negative_sign, unsigned char decimal_point,
+ unsigned char group_separator, char *group, char *ignore_list,
gnc_numeric *result, char **endstr);
/* Initialization ***************************************************/
Modified: gnucash/trunk/src/backend/file/io-example-account.c
===================================================================
--- gnucash/trunk/src/backend/file/io-example-account.c 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/src/backend/file/io-example-account.c 2006-01-22 00:27:11 UTC (rev 12928)
@@ -157,7 +157,7 @@
}
static char*
-squash_extra_whitespace(char *text)
+squash_extra_whitespace(unsigned char *text)
{
int spot;
int length = strlen(text);
Modified: gnucash/trunk/src/backend/file/sixtp-utils.c
===================================================================
--- gnucash/trunk/src/backend/file/sixtp-utils.c 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/src/backend/file/sixtp-utils.c 2006-01-22 00:27:11 UTC (rev 12928)
@@ -55,7 +55,7 @@
gboolean
isspace_str(const gchar *str, int nomorethan)
{
- const gchar *cursor = str;
+ const guchar *cursor = str;
while(*cursor && (nomorethan != 0)) {
if(!isspace(*cursor)) {
return(FALSE);
@@ -233,7 +233,7 @@
* is fixed in the next release 10.2 afaik
*/
while( (*((gchar*)str + num_read)!='\0') &&
- isspace(*((char*)str + num_read)))
+ isspace(*((unsigned char*)str + num_read)))
num_read++;
if (v)
@@ -259,7 +259,7 @@
return(FALSE);
}
while( (*((gchar*)str + num_read)!='\0') &&
- isspace(*((char*)str + num_read)))
+ isspace(*((unsigned char*)str + num_read)))
num_read++;
if (v)
@@ -277,7 +277,7 @@
hex_string_to_binary(const gchar *str, void **v, guint64 *data_len)
{
/* Convert a hex string to binary. No whitespace allowed. */
- const gchar *cursor = str;
+ const guchar *cursor = str;
guint64 str_len;
gboolean error = FALSE;
@@ -501,7 +501,7 @@
sscanf(str, " %ld%n", &nanosecs, &charcount);
while( (*((gchar*)str + charcount)!='\0') &&
- isspace(*((char*)str + charcount)))
+ isspace(*((unsigned char*)str + charcount)))
charcount++;
if(charcount != strlen(str)) return(FALSE);
Modified: gnucash/trunk/src/backend/file/sixtp.c
===================================================================
--- gnucash/trunk/src/backend/file/sixtp.c 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/src/backend/file/sixtp.c 2006-01-22 00:27:11 UTC (rev 12928)
@@ -750,7 +750,7 @@
/***********************************************************************/
static gboolean
-eat_whitespace(char **cursor)
+eat_whitespace(unsigned char **cursor)
{
while(**cursor && isspace(**cursor))
{
@@ -768,7 +768,7 @@
}
static gboolean
-search_for(char marker, char **cursor)
+search_for(unsigned char marker, unsigned char **cursor)
{
while(**cursor && **cursor != marker)
{
@@ -791,7 +791,7 @@
{
FILE *f = NULL;
char first_chunk[256];
- char* cursor = NULL;
+ unsigned char* cursor = NULL;
ssize_t num_read;
g_return_val_if_fail(filename, FALSE);
Modified: gnucash/trunk/src/calculation/expression_parser.c
===================================================================
--- gnucash/trunk/src/calculation/expression_parser.c 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/src/calculation/expression_parser.c 2006-01-22 00:27:11 UTC (rev 12928)
@@ -760,7 +760,7 @@
next_token (parser_env_ptr pe)
{
char *nstr;
- const char *str_parse = pe->parse_str;
+ const unsigned char *str_parse = pe->parse_str;
void *number;
while (isspace (*str_parse))
Modified: gnucash/trunk/src/gnome-utils/gnc-date-edit.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-date-edit.c 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/src/gnome-utils/gnc-date-edit.c 2006-01-22 00:27:11 UTC (rev 12928)
@@ -782,7 +782,8 @@
gnc_date_edit_get_date_internal (GNCDateEdit *gde)
{
struct tm tm = {0};
- char *str, *flags = NULL;
+ char *str;
+ unsigned char *flags = NULL;
/* Assert, because we're just hosed if it's NULL */
g_assert(gde != NULL);
@@ -800,7 +801,8 @@
tm.tm_year -= 1900;
if (gde->flags & GNC_DATE_EDIT_SHOW_TIME) {
- char *tokp = NULL, *temp;
+ char *tokp = NULL;
+ unsigned char *temp;
str = g_strdup (gtk_entry_get_text
(GTK_ENTRY (gde->time_entry)));
Modified: gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c 2006-01-21 21:23:02 UTC (rev 12927)
+++ gnucash/trunk/src/gnome-utils/gnc-menu-extensions.c 2006-01-22 00:27:11 UTC (rev 12928)
@@ -178,7 +178,7 @@
gnc_ext_gen_action_name (const gchar *name)
{
//gchar *extName;
- const gchar *extChar;
+ const guchar *extChar;
GString *actionName;
actionName = g_string_sized_new( strlen( name ) + 7 );
More information about the gnucash-changes
mailing list