From fbfd1be97d4243a230cf4af7c80faa2ad38b1236 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 18 Feb 2010 10:23:55 +0100 Subject: [PATCH] Discard prev regress test results --- bacula/src/filed/xattr.c | 4 ++-- regress/tests/three-pool-test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bacula/src/filed/xattr.c b/bacula/src/filed/xattr.c index 6227fd3b84..b4a4f37475 100644 --- a/bacula/src/filed/xattr.c +++ b/bacula/src/filed/xattr.c @@ -749,7 +749,7 @@ static bxattr_exit_code bsd_build_xattr_streams(JCR *jcr, FF_PKT *ff_pkt) * Print the current name into the buffer as its not null terminated we need to * use the length encoded in the string for copying only the needed bytes. */ - cnt = MIN((sizeof(current_attrname) - 1), xattr_list[index]); + cnt = MIN((int)(sizeof(current_attrname) - 1), xattr_list[index]); strncpy(current_attrname, xattr_list + (index + 1), cnt); current_attrname[cnt] = '\0'; @@ -980,7 +980,7 @@ static bxattr_exit_code bsd_parse_xattr_streams(JCR *jcr, int stream) */ cnt = extattr_set_link(jcr->last_fname, current_attrnamespace, attrname, current_xattr->value, current_xattr->value_length); - if (cnt < 0 || cnt != current_xattr->value_length) { + if (cnt < 0 || cnt != (int)current_xattr->value_length) { switch (errno) { case ENOENT: goto bail_out; diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test index 507b3d2e7b..c8bf7ae11e 100755 --- a/regress/tests/three-pool-test +++ b/regress/tests/three-pool-test @@ -30,7 +30,7 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf # Write out bconsole commands cat <${cwd}/tmp/bconcmds -@$out /dev/null +@out /dev/null messages @$out ${cwd}/tmp/log1.out @#setdebug level=200 storage=tape @@ -60,7 +60,7 @@ END_OF_DATA run_bacula cat <${cwd}/tmp/bconcmds -@$out /dev/null +@out /dev/null messages @# @# now do a restore -- 2.39.5