X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffs_xfs.c;h=789106871aa388d246a784e87e1eeb38def8314f;hp=04d6cf3a4db03943a444636abec51c27bc26c6d7;hb=94b9f91a346ceed386faf284ad2e549922a1a385;hpb=082b8310e3f92ea8da0b7011549bd86c9fd4ce95

diff --git a/second/fs_xfs.c b/second/fs_xfs.c
index 04d6cf3..7891068 100644
--- a/second/fs_xfs.c
+++ b/second/fs_xfs.c
@@ -39,8 +39,8 @@ int xfs_read_data (char *buf, int len);
 int xfs_dir (char *dirname);
 
 /* Exported in struct fs_t */
-static int xfs_open(struct boot_file_t *file, const char *dev_name,
-		    struct partition_t *part, const char *file_name);
+static int xfs_open(struct boot_file_t *file,
+		    struct partition_t *part, struct boot_fspec_t *fspec);
 static int xfs_read(struct boot_file_t *file, unsigned int size, void *buffer);
 static int xfs_seek(struct boot_file_t *file, unsigned int newpos);
 static int xfs_close(struct boot_file_t *file);
@@ -59,8 +59,8 @@ uint64_t partition_offset;
 int errnum;
 
 static int
-xfs_open(struct boot_file_t *file, const char *dev_name,
-	 struct partition_t *part, const char *file_name)
+xfs_open(struct boot_file_t *file,
+	 struct partition_t *part, struct boot_fspec_t *fspec)
 {
 	static char buffer[1024];
 
@@ -78,11 +78,11 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
 	else
 		partition_offset = 0;
 
-	strncpy(buffer, dev_name, 1020);
+	strncpy(buffer, fspec->dev, 1020);
 	if (_machine != _MACH_bplan)
 		strcat(buffer, ":0");  /* 0 is full disk in (non-buggy) OF */
 	DEBUG_F("Trying to open dev_name=%s; filename=%s; partition offset=%Lu\n",
-		buffer, file_name, partition_offset);
+		buffer, fspec->file, partition_offset);
 	file->of_device = prom_open(buffer);
 
 	if (file->of_device == PROM_INVALID_HANDLE || file->of_device == NULL)
@@ -105,8 +105,8 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
 		return FILE_ERR_BAD_FSYS;
 	}
 
-	DEBUG_F("Attempting to open %s\n", file_name);
-	strcpy(buffer, file_name); /* xfs_dir modifies argument */
+	DEBUG_F("Attempting to open %s\n", fspec->file);
+	strcpy(buffer, fspec->file); /* xfs_dir modifies argument */
 	if(!xfs_dir(buffer))
 	{
 		DEBUG_F("xfs_dir() failed. errnum = %d\n", errnum);
@@ -116,7 +116,7 @@ xfs_open(struct boot_file_t *file, const char *dev_name,
 		return errnum;
 	}
 
-	DEBUG_F("Successfully opened %s\n", file_name);
+	DEBUG_F("Successfully opened %s\n", fspec->file);
 
 	DEBUG_LEAVE(FILE_ERR_OK);
 	return FILE_ERR_OK;
@@ -490,7 +490,7 @@ next_dentry (xfs_ino_t *ino)
 	int toread;
 	static char *usual[2] = {".", ".."};
 	static xfs_dir2_sf_entry_t *sfe;
-	char *name = usual[0];
+	unsigned char *name = (unsigned char *)usual[0];
 
 	if (xfs.dirpos >= xfs.dirmax) {
 		if (xfs.forw == 0)
@@ -552,14 +552,14 @@ next_dentry (xfs_ino_t *ino)
 #undef dau
 		toread = roundup8 (namelen + 11) - 9;
 		xfs_read_data (dirbuf, toread);
-		name = (char *)dirbuf;
+		name = (unsigned char *)dirbuf;
 		xfs.blkoff += toread + 5;
 		break;
 	}
 	++xfs.dirpos;
 	name[namelen] = 0;
 
-	return name;
+	return (char *)name;
 }
 
 static char *