[Gfarm-commits] SF.net SVN: gfarm:[5404] gfarm_v2/trunk/regress/server/gfmd/db_journal/ db_journal_test.c

[<n-...@us...>]

Revision: 5404
          http://gfarm.svn.sourceforge.net/gfarm/?rev=5404&view=rev
Author:   n-soda
Date:     2011-07-05 10:51:20 +0000 (Tue, 05 Jul 2011)

Log Message:
-----------
fix missing NUL termination about the return value of dir_entry_get_name()
in source:gfarm_v2/trunk/regress/server/gfmd/db_journal/db_journal_test.c,
found on NetBSD as the following message for the regress/server/gfmd/db_journal/db_journal_apply.sh test:
{{{
error: entry_name : expected entry but entry_group1 at /usr/prj/gfarm/work/soda/src/gfarm/gfarm_v2/regress/server/gfmd/db_journal/db_journal_test.c:2585
}}}

Modified Paths:
--------------
    gfarm_v2/trunk/regress/server/gfmd/db_journal/db_journal_test.c

Modified: gfarm_v2/trunk/regress/server/gfmd/db_journal/db_journal_test.c
===================================================================
--- gfarm_v2/trunk/regress/server/gfmd/db_journal/db_journal_test.c	2011-07-05 09:33:31 UTC (rev 5403)
+++ gfarm_v2/trunk/regress/server/gfmd/db_journal/db_journal_test.c	2011-07-05 10:51:20 UTC (rev 5404)
@@ -2559,7 +2559,6 @@
 	char *entry_name1;
 	int name_len;
 	Dir dir;
-	DirEntry entry;
 	DirCursor curs;
 
 	id = t_add_test_inode(T_APPLY_INODE_DIR_INUM, GFARM_S_IFDIR);
@@ -2577,16 +2576,17 @@
 	    (dir = inode_get_dir(id)) != NULL);
 	TEST_ASSERT_B("dir_cursor_set_pos",
 	    dir_cursor_set_pos(dir, 0, &curs));
+	TEST_ASSERT_NOERR("dir_cursor_get_name_and_inode",
+	    dir_cursor_get_name_and_inode(dir, &curs, &entry_name1, &ie1));
 	TEST_ASSERT_B("dir_cursor_get_entry",
-	    (entry = dir_cursor_get_entry(dir, &curs)) != NULL);
-	TEST_ASSERT_B("dir_entry_get_name",
-	    (entry_name1 = dir_entry_get_name(entry, &name_len)) != NULL);
+	    entry_name1 != NULL);
 	TEST_ASSERT_S("entry_name",
 	    entry_name, entry_name1);
 	TEST_ASSERT_B("dir_entry_get_inode",
-	    (ie1 = dir_entry_get_inode(entry)) != NULL);
+	    ie1 != NULL);
 	TEST_ASSERT_B("entry",
 	    ie == ie1);
+	free(entry_name1);
 }
 
 static void


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