← Back to branch summary

~ubuntu-branches/debian/sid/grub2/sid-200907171837

« back to all changes in this revision

Viewing changes to fs/sfs.c

  • Committer: Bazaar Package Importer
  • Author(s): Otavio Salvador
  • Date: 2006-06-10 19:57:01 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060610195701-2khcfacexb229tq4
Tags: 1.94-3
http://bugs.debian.org/372548
Fix FTBFS in amd64. Closes: 372548

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/sfs.c
288
288
    goto fail;
289
289
 
290
290
  /* Make sure this is a sfs filesystem.  */
291
 
  if (grub_strncmp (data->rblock.header.magic, "SFS", 4))
 
291
  if (grub_strncmp ((char *) (data->rblock.header.magic), "SFS", 4))
292
292
    {
293
293
      grub_error (GRUB_ERR_BAD_FS, "not a sfs filesystem");
294
294
      goto fail;
296
296
 
297
297
  data->blocksize = grub_be_to_cpu32 (data->rblock.blocksize);
298
298
  rootobjc_data = grub_malloc (data->blocksize);
299
 
  if (!rootobjc_data)
 
299
  if (! rootobjc_data)
300
300
    goto fail;
301
301
 
302
302
  /* Read the root object container.  */
312
312
  data->diropen.block = blk;
313
313
  data->diropen.data = data;
314
314
  data->disk = disk;
315
 
  data->label = grub_strdup (rootobjc->objects[0].filename);
 
315
  data->label = grub_strdup ((char *) (rootobjc->objects[0].filename));
316
316
 
317
317
  return data;
318
318
 
403
403
        {
404
404
          struct grub_sfs_obj *obj;
405
405
          obj = (struct grub_sfs_obj *) ((char *) objc + pos);
406
 
          char *filename = obj->filename;
 
406
          char *filename = (char *) (obj->filename);
407
407
          int len;
408
408
          enum grub_fshelp_filetype type;
409
409
          unsigned int block;