IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Phil Longstaff's patch to make the GUID length a magic number.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13309 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2006-02-19 23:41:53 +00:00
parent e609f9915a
commit 9606f87741
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -72,6 +72,9 @@
Don't let users post negative invoices. (#166864) Don't let users post negative invoices. (#166864)
Pop up an error dialog and prevent the post. Pop up an error dialog and prevent the post.
* lib/libqof/qof/guid.[ch]:
Phil Longstaff's patch to make the GUID length a magic number.
2006-02-18 Derek Atkins <derek@ihtfp.com> 2006-02-18 Derek Atkins <derek@ihtfp.com>
* intl-scm/xgettext.scm: remove the absolute path from filenames * intl-scm/xgettext.scm: remove the absolute path from filenames

16
lib/libqof/qof/guid.c
View File

@ -126,7 +126,7 @@ guid_null(void)
char *tmp = "NULLGUID.EMPTY."; char *tmp = "NULLGUID.EMPTY.";
/* 16th space for '\O' */ /* 16th space for '\O' */
for (i = 0; i < 16; i++) for (i = 0; i < GUID_DATA_SIZE; i++)
null_guid.data[i] = tmp[i]; null_guid.data[i] = tmp[i];
null_inited = 1; null_inited = 1;
@ -504,7 +504,7 @@ guid_new(GUID *guid)
* is just hiding the problem, not fixing it. * is just hiding the problem, not fixing it.
*/ */
init_from_int (433781*counter); init_from_int (433781*counter);
init_from_buff (guid->data, 16); init_from_buff (guid->data, GUID_DATA_SIZE);
if (counter == 0) if (counter == 0)
{ {
@ -540,7 +540,7 @@ encode_md5_data(const unsigned char *data, char *buffer)
{ {
size_t count; size_t count;
for (count = 0; count < 16; count++, buffer += 2) for (count = 0; count < GUID_DATA_SIZE; count++, buffer += 2)
sprintf(buffer, "%02x", data[count]); sprintf(buffer, "%02x", data[count]);
} }
@ -557,7 +557,7 @@ decode_md5_string(const unsigned char *string, unsigned char *data)
if (NULL == data) return FALSE; if (NULL == data) return FALSE;
if (NULL == string) goto badstring; if (NULL == string) goto badstring;
for (count = 0; count < 16; count++) for (count = 0; count < GUID_DATA_SIZE; count++)
{ {
/* check for a short string e.g. null string ... */ /* check for a short string e.g. null string ... */
if ((0==string[2*count]) || (0==string[2*count+1])) goto badstring; if ((0==string[2*count]) || (0==string[2*count+1])) goto badstring;
@ -583,7 +583,7 @@ decode_md5_string(const unsigned char *string, unsigned char *data)
return TRUE; return TRUE;
badstring: badstring:
for (count = 0; count < 16; count++) for (count = 0; count < GUID_DATA_SIZE; count++)
{ {
data[count] = 0; data[count] = 0;
} }
@ -635,7 +635,7 @@ gboolean
guid_equal(const GUID *guid_1, const GUID *guid_2) guid_equal(const GUID *guid_1, const GUID *guid_2)
{ {
if (guid_1 && guid_2) if (guid_1 && guid_2)
return (memcmp(guid_1, guid_2, sizeof(GUID)) == 0); return (memcmp(guid_1, guid_2, GUID_DATA_SIZE) == 0);
else else
return FALSE; return FALSE;
} }
@ -653,7 +653,7 @@ guid_compare(const GUID *guid_1, const GUID *guid_2)
if (guid_1 && !guid_2) if (guid_1 && !guid_2)
return 1; return 1;
return memcmp (guid_1, guid_2, sizeof (GUID)); return memcmp (guid_1, guid_2, GUID_DATA_SIZE);
} }
guint guint
@ -677,7 +677,7 @@ guid_hash_to_guint (gconstpointer ptr)
unsigned int i, j; unsigned int i, j;
for (i = 0, j = 0; i < sizeof(guint); i++, j++) { for (i = 0, j = 0; i < sizeof(guint); i++, j++) {
if (j == 16) j = 0; if (j == GUID_DATA_SIZE) j = 0;
hash <<= 4; hash <<= 4;
hash |= guid->data[j]; hash |= guid->data[j];

3
lib/libqof/qof/guid.h
View File

@ -50,9 +50,10 @@
*/ */
/** The type used to store guids */ /** The type used to store guids */
#define GUID_DATA_SIZE 16
typedef union _GUID typedef union _GUID
{ {
unsigned char data[16]; unsigned char data[GUID_DATA_SIZE];
int __align_me; /* this just ensures that GUIDs are 32-bit int __align_me; /* this just ensures that GUIDs are 32-bit
* aligned on systems that need them to be. */ * aligned on systems that need them to be. */