[Opensync-commits] r5779 - in trunk: opensync/common tests tests/engine-tests tests/helper-tests tests/mock-plugin

[<svn...@op...>]

Author: dgollub
Date: Thu Sep 17 16:39:20 2009
New Revision: 5779
URL: http://www.opensync.org/changeset/5779

Log:
Add OSyncError** to parameter list of osync_rand_str

See #1087, comment:10

Modified:
   trunk/opensync/common/opensync_string.c
   trunk/opensync/common/opensync_string.h
   trunk/tests/engine-tests/check_engine.c
   trunk/tests/helper-tests/check_hash.c
   trunk/tests/mock-plugin/mock_format.c
   trunk/tests/support.c

Modified: trunk/opensync/common/opensync_string.c
==============================================================================
--- trunk/opensync/common/opensync_string.c	Thu Sep 17 02:22:25 2009	(r5778)
+++ trunk/opensync/common/opensync_string.c	Thu Sep 17 16:39:20 2009	(r5779)
@@ -55,7 +55,7 @@
 	return ret;
 }
 
-char *osync_rand_str(int maxlength)
+char *osync_rand_str(int maxlength, OSyncError **error)
 {
 	char *randchars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIKLMNOPQRSTUVWXYZ1234567890";
 	
@@ -65,8 +65,9 @@
 
 	length = g_random_int_range(1, maxlength + 1);
 
-	retchar = osync_try_malloc0(length * sizeof(char) + 1, NULL);
-	osync_return_val_if_fail(retchar, NULL);
+	retchar = osync_try_malloc0(length * sizeof(char) + 1, error);
+	if (!retchar)
+		goto error;
 
 	retchar[0] = 0;
 
@@ -76,5 +77,8 @@
 	}
 
 	return retchar;
+
+error:
+	return NULL;
 }
 

Modified: trunk/opensync/common/opensync_string.h
==============================================================================
--- trunk/opensync/common/opensync_string.h	Thu Sep 17 02:22:25 2009	(r5778)
+++ trunk/opensync/common/opensync_string.h	Thu Sep 17 16:39:20 2009	(r5779)
@@ -69,7 +69,7 @@
  *          NULL on OOM situation.
  * 
  */
-OSYNC_EXPORT char *osync_rand_str(int maxlength);
+OSYNC_EXPORT char *osync_rand_str(int maxlength, OSyncError **error);
 
 /*@} */
 

Modified: trunk/tests/engine-tests/check_engine.c
==============================================================================
--- trunk/tests/engine-tests/check_engine.c	Thu Sep 17 02:22:25 2009	(r5778)
+++ trunk/tests/engine-tests/check_engine.c	Thu Sep 17 16:39:20 2009	(r5779)
@@ -1420,7 +1420,8 @@
 	
 	osync_change_set_changetype(change, OSYNC_CHANGE_TYPE_ADDED);
 
-	char *uid = osync_rand_str(16); 
+	char *uid = osync_rand_str(16, &error); 
+	osync_assert(error == NULL);
 	osync_change_set_uid(change, uid);
 	g_free(uid);
 	
@@ -1632,7 +1633,8 @@
 		osync_assert(error == NULL);
 		
 		osync_change_set_changetype(change, OSYNC_CHANGE_TYPE_ADDED);
-		char *rand = osync_rand_str(16);
+		char *rand = osync_rand_str(16, &error);
+		osync_assert(error == NULL);
 		char *uid = osync_strdup_printf("uid_%s_%u", rand, i);
 		osync_change_set_uid(change, uid);
 		osync_free(uid);
@@ -1837,7 +1839,8 @@
 		osync_assert(error == NULL);
 		
 		osync_change_set_changetype(change, OSYNC_CHANGE_TYPE_ADDED);
-		char *uid = osync_rand_str(16);
+		char *uid = osync_rand_str(16, &error);
+		osync_assert(error == NULL);
 		osync_change_set_uid(change, uid);
 		g_free(uid);
 		

Modified: trunk/tests/helper-tests/check_hash.c
==============================================================================
--- trunk/tests/helper-tests/check_hash.c	Thu Sep 17 02:22:25 2009	(r5778)
+++ trunk/tests/helper-tests/check_hash.c	Thu Sep 17 16:39:20 2009	(r5779)
@@ -83,7 +83,8 @@
 
 	osync_change_set_uid(fakechange, "test1");
 
-	char *rndhash = osync_rand_str(g_random_int_range(100, 200));
+	char *rndhash = osync_rand_str(g_random_int_range(100, 200), &error);
+	osync_assert(error == NULL);
 
 	osync_change_set_hash(fakechange, rndhash);
 	osync_change_set_changetype(fakechange, OSYNC_CHANGE_TYPE_ADDED);

Modified: trunk/tests/mock-plugin/mock_format.c
==============================================================================
--- trunk/tests/mock-plugin/mock_format.c	Thu Sep 17 02:22:25 2009	(r5778)
+++ trunk/tests/mock-plugin/mock_format.c	Thu Sep 17 16:39:20 2009	(r5779)
@@ -101,7 +101,8 @@
 	OSyncFileFormat *file = osync_try_malloc0(sizeof(OSyncFileFormat), error);
 	osync_assert(file);
 
-	file->path = osync_rand_str(g_random_int_range(1, 100));
+	file->path = osync_rand_str(g_random_int_range(1, 100), error);
+	osync_assert(error == NULL);
 	
 	file->data = input;
 	file->size = inpsize - 1;
@@ -167,11 +168,14 @@
 
 static void create_file(char **buffer, unsigned int *size, void *user_data)
 {
+	OSyncError *error = NULL;
 	OSyncFileFormat *outfile = osync_try_malloc0(sizeof(OSyncFileFormat), NULL);
 	
-	outfile->path = osync_rand_str(g_random_int_range(1, 100));
+	outfile->path = osync_rand_str(g_random_int_range(1, 100), &error);
+	osync_assert(error == NULL);
 	
-	outfile->data = osync_rand_str(g_random_int_range(1, 100));
+	outfile->data = osync_rand_str(g_random_int_range(1, 100), &error);
+	osync_assert(error == NULL);
 	outfile->size = strlen(outfile->data);
 	
 	*buffer = (char *)outfile;

Modified: trunk/tests/support.c
==============================================================================
--- trunk/tests/support.c	Thu Sep 17 02:22:25 2009	(r5778)
+++ trunk/tests/support.c	Thu Sep 17 16:39:20 2009	(r5779)
@@ -318,7 +318,9 @@
 
 void create_random_file(const char *path)
 {
-	char *content = osync_rand_str(g_random_int_range(100, 200));
+	OSyncError *error = NULL;
+	char *content = osync_rand_str(g_random_int_range(100, 200), &error);
+	fail_unless(error == NULL, NULL);
 	osync_assert(osync_file_write(path, content, strlen(content), 0700, NULL) == TRUE);
 	g_free(content);
 }