Fix build failure.

[xfstests-dev.git] / dmapi / src / suite2 / src / test_invis.c

diff --git a/dmapi/src/suite2/src/test_invis.c b/dmapi/src/suite2/src/test_invis.c
index d97274902341d40b72b2cb379e95d17fffeedc67..115ffb7b79a08095257f5ed174ec2a84a9f07cb5 100644 (file)
--- a/dmapi/src/suite2/src/test_invis.c
+++ b/dmapi/src/suite2/src/test_invis.c
@@ -1,33 +1,19 @@
 /*
 /*

- * Copyright (c) 2000-2001 Silicon Graphics, Inc.  All Rights Reserved.
- * 
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
+ * Copyright (c) 2000-2001 Silicon Graphics, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as

  * published by the Free Software Foundation.
  * published by the Free Software Foundation.

- * 
- * This program is distributed in the hope that it would be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
- * Further, this software is distributed without any warranty that it is
- * free of the rightful claim of any third person regarding infringement
- * or the like.  Any license provided herein, whether implied or
- * otherwise, applies only to this software file.  Patent licenses, if
- * any, provided herein do not apply to combinations of this program with
- * other software, or any other product whatsoever.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write the Free Software Foundation, Inc., 59
- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
- * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>


@@ -150,7 +136,7 @@ main(
        
        /* Get a random character for read/write tests */
        srand((unsigned int)time(NULL));
        
        /* Get a random character for read/write tests */
        srand((unsigned int)time(NULL));

-       ch = (char)rand(); 
+       ch = (u_char)rand(); 

 
        printf("Invisible read/write tests beginning...\n");
        
 
        printf("Invisible read/write tests beginning...\n");
        


@@ -259,7 +245,7 @@ main(
              /* Be sure the buffer is filled with the test char */
              error_reported = 0;
              for (k=0; k<i; k++){
              /* Be sure the buffer is filled with the test char */
              error_reported = 0;
              for (k=0; k<i; k++){

-               if (((char *)bufp)[k] == ch) {
+               if (((u_char *)bufp)[k] == ch) {

                  if (Vflag) printf(".");
                }
                else {
                  if (Vflag) printf(".");
                }
                else {


@@ -327,26 +313,34 @@ main(
                  test_file);
        }
        else {
                  test_file);
        }
        else {

+         dm_off_t offset;

 
          /* Try writing a character waaaaaay up in the millions range */
          sprintf(bufp, "%c", ch);
 
          /* Try writing a character waaaaaay up in the millions range */
          sprintf(bufp, "%c", ch);

+          if (stat(test_file, &statbuf)){
+           fprintf(stdout, 
+                    "Error: unable to stat the test file; %s \n", 
+                    test_file);
+          }
+          offset = ((1000000*(dm_off_t)(ch)) > statbuf.st_size) ? 
+                            statbuf.st_size : (1000000*(dm_off_t)(ch));

          if (dm_write_invis(sid, hanp, hlen, DM_NO_TOKEN, 0, 
          if (dm_write_invis(sid, hanp, hlen, DM_NO_TOKEN, 0, 

-                            (1000000*(unsigned int)(ch)), 1, bufp)==-1){
-           printf("Error invis-writing %s at byte %u million: %s\n", 
-                  (char*)bufp, (unsigned int)ch, ERR_NAME);
+                            offset, 1, bufp)==-1){
+           printf("Error invis-writing 0x%x at byte 0x%x million: %s\n", 
+                  *(u_char *)bufp, (unsigned int)ch, ERR_NAME);

          }
          else if (dm_read_invis(sid, hanp, hlen, DM_NO_TOKEN,
          }
          else if (dm_read_invis(sid, hanp, hlen, DM_NO_TOKEN,

-                                (1000000*(unsigned int)(ch)), 1, bufp)==-1){
+                                offset, 1, bufp)==-1){

            printf("Error invis-reading at byte %u million: %s\n",
                   (unsigned int)ch, ERR_NAME);
          }
            printf("Error invis-reading at byte %u million: %s\n",
                   (unsigned int)ch, ERR_NAME);
          }

-         else if (((char*)bufp)[0]!=ch) {
+         else if (((u_char *)bufp)[0]!=ch) {

            printf("Error: wanted to read %c and instead got %s.\n",
            printf("Error: wanted to read %c and instead got %s.\n",

-                  ch, (char*)bufp);
+                  ch, (u_char *)bufp);

          }
          else if (Vflag) {
          }
          else if (Vflag) {

-           printf("Report: \"%c\" was written and \"%s\" was read "
-                  "at byte %d million.\n", ch, (char*)bufp, ch);
+           printf("Report: \"0x%x\" was written and \"0x%x\" was read "
+                  "at byte %d million.\n", ch, *(u_char *)bufp, ch);

          }
 
 #ifdef __sgi
          }
 
 #ifdef __sgi


@@ -355,21 +349,21 @@ main(
          if (dm_write_invis(sid, hanp, hlen, DM_NO_TOKEN, 0, 
                             2147840000, 1, bufp)==-1){
            printf("Error invis-writing %s at 2 gigabytes: %s\n", 
          if (dm_write_invis(sid, hanp, hlen, DM_NO_TOKEN, 0, 
                             2147840000, 1, bufp)==-1){
            printf("Error invis-writing %s at 2 gigabytes: %s\n", 

-                  (char*)bufp, ERR_NAME);
+                  (u_char *)bufp, ERR_NAME);

          }
          else if (dm_read_invis(sid, hanp, hlen, DM_NO_TOKEN,
                                 2147840000, 1, bufp)==-1){
            printf("Error invis-reading at 2 gigabytes: %s\n",
                   ERR_NAME);
          }
          }
          else if (dm_read_invis(sid, hanp, hlen, DM_NO_TOKEN,
                                 2147840000, 1, bufp)==-1){
            printf("Error invis-reading at 2 gigabytes: %s\n",
                   ERR_NAME);
          }

-         else if (((char*)bufp)[0]!=ch) {
+         else if (((u_char *)bufp)[0]!=ch) {

            printf("Error: wanted to read %c and instead got %s.\n",
            printf("Error: wanted to read %c and instead got %s.\n",

-                  ch, (char*)bufp);
+                  ch, (u_char *)bufp);

          }
          else if (Vflag) {
          }
          else if (Vflag) {

-           printf("Report: \"%c\" was written and \"%s\" was read "
+           printf("Report: \"0x%x\" was written and \"0x%x\" was read "

                   "at 2147840000 bytes\n\t(a bit over 2 gigabytes).\n", 
                   "at 2147840000 bytes\n\t(a bit over 2 gigabytes).\n", 

-                  ch, (char*)bufp);
+                  ch, *(u_char *)bufp);

          }
 #endif
 
          }
 #endif