fs: remove implicit compiler calls to memset/memcpy

index f673897..26b74a7 100644
@@ -99,7 +99,7 @@ enum
 #define AFFS_MAX_LOG_BLOCK_SIZE 4
 #define AFFS_MAX_SUPERBLOCK 1
 
-
+
 
 struct grub_fshelp_node
 {

@@ -127,7 +127,7 @@ struct grub_affs_data
 
 static grub_dl_t my_mod;
 
-
+
 static grub_disk_addr_t
 grub_affs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
 {

@@ -345,8 +345,8 @@ grub_affs_create_node (grub_fshelp_node_t dir,
   if (len > sizeof (fil->name))
     len = sizeof (fil->name);
   *grub_latin1_to_utf8 (name_u8, fil->name, len) = '\0';
-  
-  (*node)->di = *fil;
+
+  grub_memcpy (&(*node)->di, fil, sizeof (*fil));
   for (nest = 0; nest < 8; nest++)
     {
       switch ((*node)->di.type)

@@ -408,8 +408,8 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir,
   node = grub_zalloc (sizeof (*node));
   if (!node)
     return 1;
-    
-  *node = *dir;
+
+  grub_memcpy (node, dir, sizeof (*dir));
   if (hook (".", GRUB_FSHELP_DIR, node, hook_data))
     return 1;
   if (dir->parent)

@@ -417,7 +417,7 @@ grub_affs_iterate_dir (grub_fshelp_node_t dir,
       node = grub_zalloc (sizeof (*node));
       if (!node)
 	return 1;
-      *node = *dir->parent;
+      grub_memcpy (node, dir->parent, sizeof (*dir->parent));
       if (hook ("..", GRUB_FSHELP_DIR, node, hook_data))
 	return 1;
     }

@@ -491,7 +491,7 @@ grub_affs_open (struct grub_file *file, const char *name)
     goto fail;
 
   file->size = grub_be_to_cpu32 (fdiro->di.size);
-  data->diropen = *fdiro;
+  grub_memcpy (&data->diropen, fdiro, sizeof (*fdiro));
   grub_free (fdiro);
 
   file->data = data;

@@ -681,7 +681,7 @@ grub_affs_mtime (grub_device_t device, grub_int32_t *t)
   return GRUB_ERR_NONE;
 }
 
-
+
 static struct grub_fs grub_affs_fs =
   {
     .name = "affs",

index d2b490b..71ca674 100644
@@ -530,13 +530,13 @@ iterate_in_b_tree (grub_disk_t disk,
       err = read_b_node (disk, sb, ino,
 			 node_off,
 			 &node,
-			 &key_data, 
+			 &key_data,
 			 &keylen_idx,
 			 &key_values);
 
       if (err)
 	return 0;
-      
+
       for (i = 0; i < grub_bfs_to_cpu_treehead (node->count_keys); i++)
 	{
 	  char c;

@@ -682,7 +682,7 @@ find_in_b_tree (grub_disk_t disk,
 		level--;
 		grub_free (node);
 		continue;
-	      }	      
+	      }
 	  }
 	else if (level != 0
 		 && i + 1 < grub_bfs_to_cpu_treehead (node->count_keys))

@@ -802,11 +802,11 @@ find_file (const char *path, grub_disk_t disk,
 	   enum grub_fshelp_filetype exptype)
 {
   grub_err_t err;
-  struct grub_fshelp_node root = {
-    .disk = disk,
-    .sb = sb,
-  };
-  struct grub_fshelp_node *found;
+  struct grub_fshelp_node root, *found;
+
+  grub_memset (&root, 0, sizeof (root));
+  root.disk = disk;
+  root.sb = sb;
 
   err = read_extent (disk, sb, &sb->root_dir, 0, 0, &root.ino,
 		     sizeof (root.ino));

@@ -827,7 +827,7 @@ mount (grub_disk_t disk, struct grub_bfs_superblock *sb)
   grub_err_t err;
   err = grub_disk_read (disk, SUPERBLOCK, 0, sizeof (*sb), sb);
   if (err == GRUB_ERR_OUT_OF_RANGE)
-    return grub_error (GRUB_ERR_BAD_FS, 
+    return grub_error (GRUB_ERR_BAD_FS,
 #ifdef MODE_AFS
 		       "not an AFS filesystem"
 #else

@@ -843,7 +843,7 @@ mount (grub_disk_t disk, struct grub_bfs_superblock *sb)
       || (grub_bfs_to_cpu32 (sb->bsize)
 	  != (1U << grub_bfs_to_cpu32 (sb->log2_bsize)))
       || grub_bfs_to_cpu32 (sb->log2_bsize) < GRUB_DISK_SECTOR_BITS)
-    return grub_error (GRUB_ERR_BAD_FS, 
+    return grub_error (GRUB_ERR_BAD_FS,
 #ifdef MODE_AFS
 		       "not an AFS filesystem"
 #else

@@ -887,13 +887,14 @@ static grub_err_t
 grub_bfs_dir (grub_device_t device, const char *path,
 	      grub_fs_dir_hook_t hook, void *hook_data)
 {
-  struct grub_bfs_dir_ctx ctx = {
-    .device = device,
-    .hook = hook,
-    .hook_data = hook_data
-  };
+  struct grub_bfs_dir_ctx ctx;
   grub_err_t err;
 
+  grub_memset (&ctx, 0, sizeof (ctx));
+  ctx.device = device;
+  ctx.hook = hook;
+  ctx.hook_data = hook_data;
+
   err = mount (device->disk, &ctx.sb);
   if (err)
     return err;

@@ -930,7 +931,7 @@ grub_bfs_open (struct grub_file *file, const char *name)
     data = grub_zalloc (sizeof (struct grub_bfs_data));
     if (!data)
       return grub_errno;
-    data->sb = sb;
+    grub_memcpy (&data->sb, &sb, sizeof (sb));
     grub_memcpy (&data->ino, &ino, sizeof (data->ino));
     file->data = data;
     file->size = grub_bfs_to_cpu64 (ino.size);

index 9cffa91..8d99818 100644
@@ -355,7 +355,7 @@ next (struct grub_btrfs_data *data,
   *outsize = grub_le_to_cpu32 (leaf.size);
   *outaddr = desc->data[desc->depth - 1].addr + sizeof (struct btrfs_header)
     + grub_le_to_cpu32 (leaf.offset);
-  *key_out = leaf.key;
+  grub_memcpy (key_out, &leaf.key, sizeof (leaf.key));
   return 1;
 }
 

@@ -436,7 +436,7 @@ lower_bound (struct grub_btrfs_data *data,
 		}
 	      if (key_cmp (&node.key, key_in) > 0)
 		break;
-	      node_last = node;
+	      grub_memcpy (&node_last, &node, sizeof (node));
 	      have_last = 1;
 	    }
 	  if (have_last)

@@ -490,7 +490,7 @@ lower_bound (struct grub_btrfs_data *data,
 	      break;
 
 	    have_last = 1;
-	    leaf_last = leaf;
+	    grub_memcpy (&leaf_last, &leaf, sizeof (leaf));
 	  }
 
 	if (have_last)

@@ -1486,7 +1486,7 @@ find_path (struct grub_btrfs_data *data,
 	      grub_free (origpath);
 	      return err;
 	    }
-	  *key = cdirel->key;
+	  grub_memcpy (key, &cdirel->key, sizeof (cdirel->key));
 	  if (*type == GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)
 	    key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
 	  break;

117 lines not on this page · raw message

index 21159e8..a8663f0 100644
@@ -19,7 +19,7 @@
 
 /* HFS+ is documented at http://developer.apple.com/technotes/tn/tn1150.html */
 
-#define grub_fshelp_node grub_hfsplus_file 
+#define grub_fshelp_node grub_hfsplus_file
 #include <grub/err.h>
 #include <grub/file.h>
 #include <grub/mm.h>

@@ -105,7 +105,7 @@ enum grub_hfsplus_filetype
 
 static grub_dl_t my_mod;
 
-
+
 
 grub_err_t (*grub_hfsplus_open_compressed) (struct grub_fshelp_node *node);
 grub_ssize_t (*grub_hfsplus_read_compressed) (struct grub_hfsplus_file *node,

@@ -145,7 +145,7 @@ grub_hfsplus_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
 {
   struct grub_hfsplus_btnode *nnode = 0;
   grub_disk_addr_t blksleft = fileblock;
-  struct grub_hfsplus_extent *extents = node->compressed 
+  struct grub_hfsplus_extent *extents = node->compressed
     ? &node->resource_extents[0] : &node->extents[0];
 
   while (1)

@@ -461,7 +461,7 @@ grub_hfsplus_cmp_extkey (struct grub_hfsplus_key *keya,
 
   if (extkey_a->type < extkey_b->type)
     return -1;
-  
+
   akey = grub_be_to_cpu32 (extkey_a->start);
   if (akey > extkey_b->start)
     return 1;

@@ -548,7 +548,7 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,
 			   struct grub_hfsplus_key_internal *key,
 			   int (*compare_keys) (struct grub_hfsplus_key *keya,
 						struct grub_hfsplus_key_internal *keyb),
-			   struct grub_hfsplus_btnode **matchnode, 
+			   struct grub_hfsplus_btnode **matchnode,
 			   grub_off_t *keyoffset)
 {
   grub_uint64_t currnode;

@@ -800,7 +800,7 @@ grub_hfsplus_iterate_dir (grub_fshelp_node_t dir,
     fsnode = grub_malloc (sizeof (*fsnode));
     if (!fsnode)
       return 1;
-    *fsnode = *dir;
+    grub_memcpy (fsnode, dir, sizeof (*dir));
     if (hook (".", GRUB_FSHELP_DIR, fsnode, hook_data))
       return 1;
   }

@@ -853,7 +853,7 @@ grub_hfsplus_open (struct grub_file *file, const char *name)
     }
 
   file->size = fdiro->size;
-  data->opened_file = *fdiro;
+  grub_memcpy (&data->opened_file, fdiro, sizeof (*fdiro));
   grub_free (fdiro);
 
   file->data = data;

@@ -1074,7 +1074,7 @@ grub_hfsplus_uuid (grub_device_t device, char **uuid)
 }
 
 
-
+
 static struct grub_fs grub_hfsplus_fs =
   {
     .name = "hfsplus",

index c9c8374..30253df 100644
@@ -174,13 +174,13 @@ enum
   };
 
 static grub_dl_t my_mod;
-
+
 
 static grub_err_t
 iso9660_to_unixtime (const struct grub_iso9660_date *i, grub_int32_t *nix)
 {
   struct grub_datetime datetime;
-  
+
   if (! i->year[0] && ! i->year[1]
       && ! i->year[2] && ! i->year[3]
       && ! i->month[0] && ! i->month[1]

@@ -197,7 +197,7 @@ iso9660_to_unixtime (const struct grub_iso9660_date *i, grub_int32_t *nix)
   datetime.hour = (i->hour[0] - '0') * 10 + (i->hour[1] - '0');
   datetime.minute = (i->minute[0] - '0') * 10 + (i->minute[1] - '0');
   datetime.second = (i->second[0] - '0') * 10 + (i->second[1] - '0');
-  
+
   if (!grub_datetime2unixtime (&datetime, nix))
     return grub_error (GRUB_ERR_BAD_NUMBER, "incorrect date");
   *nix -= i->offset * 60 * 15;

@@ -215,7 +215,7 @@ iso9660_to_unixtime2 (const struct grub_iso9660_date2 *i, grub_int32_t *nix)
   datetime.hour = i->hour;
   datetime.minute = i->minute;
   datetime.second = i->second;
-  
+
   if (!grub_datetime2unixtime (&datetime, nix))
     return 0;
   *nix -= i->offset * 60 * 15;

@@ -408,7 +408,7 @@ set_rockridge (struct grub_iso9660_data *data)
       rootnode.alloc_dirents = ARRAY_SIZE (rootnode.dirents);
       rootnode.have_dirents = 1;
       rootnode.have_symlink = 0;
-      rootnode.dirents[0] = data->voldesc.rootdir;
+      grub_memcpy (&rootnode.dirents[0], &data->voldesc.rootdir, sizeof (data->voldesc.rootdir));
 
       /* The 2nd data byte stored how many bytes are skipped every time
 	 to get to the SUA (System Usage Area).  */

@@ -498,7 +498,7 @@ grub_iso9660_mount (grub_disk_t disk)
 static char *
 grub_iso9660_read_symlink (grub_fshelp_node_t node)
 {
-  return node->have_symlink 
+  return node->have_symlink
     ? grub_strdup (node->symlink
 		   + (node->have_dirents) * sizeof (node->dirents[0])
 		   - sizeof (node->dirents)) : grub_strdup ("");

@@ -537,7 +537,7 @@ add_part (struct iterate_dir_ctx *ctx,
     return;
 
   grub_memcpy (ctx->symlink + size, part, len2);
-  ctx->symlink[size + len2] = 0;  
+  ctx->symlink[size + len2] = 0;
 }
 
 static grub_err_t

@@ -762,7 +762,7 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
             ctx.filename_alloc = 1;
           }
 
-	node->dirents[0] = dirent;
+	grub_memcpy (&node->dirents[0], &dirent, sizeof (dirent));
 	while (dirent.flags & FLAG_MORE_EXTENTS)
 	  {
 	    offset += dirent.len;

@@ -777,7 +777,7 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
 	      {
 		struct grub_fshelp_node *new_node;
 		node->alloc_dirents *= 2;
-		new_node = grub_realloc (node, 
+		new_node = grub_realloc (node,
 					 sizeof (struct grub_fshelp_node)
 					 + ((node->alloc_dirents
 					     - ARRAY_SIZE (node->dirents))

@@ -791,7 +791,7 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
 		  }
 		node = new_node;
 	      }
-	    node->dirents[node->have_dirents++] = dirent;
+	    grub_memcpy (&node->dirents[node->have_dirents++], &dirent, sizeof (dirent));
 	  }
 	if (ctx.symlink)
 	  {

@@ -837,7 +837,7 @@ grub_iso9660_iterate_dir (grub_fshelp_node_t dir,
 }
 
 
-
+
 /* Context for grub_iso9660_dir.  */
 struct grub_iso9660_dir_ctx
 {

@@ -881,7 +881,7 @@ grub_iso9660_dir (grub_device_t device, const char *path,
   rootnode.alloc_dirents = 0;
   rootnode.have_dirents = 1;
   rootnode.have_symlink = 0;
-  rootnode.dirents[0] = data->voldesc.rootdir;
+  grub_memcpy (&rootnode.dirents[0], &data->voldesc.rootdir, sizeof (data->voldesc.rootdir));
 
   /* Use the fshelp function to traverse the path.  */
   if (grub_fshelp_find_file (path, &rootnode,

@@ -924,7 +924,7 @@ grub_iso9660_open (struct grub_file *file, const char *name)
   rootnode.alloc_dirents = 0;
   rootnode.have_dirents = 1;
   rootnode.have_symlink = 0;
-  rootnode.dirents[0] = data->voldesc.rootdir;
+  grub_memcpy (&rootnode.dirents[0], &data->voldesc.rootdir, sizeof (data->voldesc.rootdir));
 
   /* Use the fshelp function to traverse the path.  */
   if (grub_fshelp_find_file (name, &rootnode,

@@ -1069,7 +1069,7 @@ grub_iso9660_uuid (grub_device_t device, char **uuid)
 }
 
 /* Get writing time of filesystem. */
-static grub_err_t 
+static grub_err_t
 grub_iso9660_mtime (grub_device_t device, grub_int32_t *timebuf)
 {
   struct grub_iso9660_data *data;

@@ -1094,7 +1094,7 @@ grub_iso9660_mtime (grub_device_t device, grub_int32_t *timebuf)
 }
 
 
-
+
 
 static struct grub_fs grub_iso9660_fs =
   {

index 839bff8..4441ad4 100644
@@ -539,7 +539,7 @@ grub_udf_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
 		    (buf + sizeof (struct grub_udf_aed));
 	      continue;
 	    }
-	      
+
 	  if (filebytes < adlen)
 	    {
 	      grub_uint32_t ad_block_num = ad->block.block_num;

@@ -793,7 +793,7 @@ grub_udf_mount (grub_disk_t disk)
       goto fail;
     }
 
-  data->root_icb = root_fs.root_icb;
+  grub_memcpy (&data->root_icb, &root_fs.root_icb, sizeof (root_fs.root_icb));
 
   return data;
 

863 lines not on this page · raw message

index 0f2ea6b..232408e 100644
@@ -562,7 +562,7 @@ huft_build (unsigned *b,	/* code lengths in bits (all assumed <= BMAX) */
 		  r.e = (uch) (16 + j);		/* bits in this table */
 		  r.v.t = q;	/* pointer to this table */
 		  j = i >> (w - l);	/* (get around Turbo C bug) */
-		  u[h - 1][j] = r;	/* connect to last table */
+		  grub_memcpy (&u[h - 1][j], &r, sizeof (r));	/* connect to last table */
 		}
 	    }
 

@@ -585,7 +585,7 @@ huft_build (unsigned *b,	/* code lengths in bits (all assumed <= BMAX) */
 	  /* fill code-like entries with r */
 	  f = 1 << (k - w);
 	  for (j = i >> w; j < z; j += f)
-	    q[j] = r;
+	    grub_memcpy (&q[j], &r, sizeof (r));
 
 	  /* backwards increment the k-bit code i */
 	  for (j = 1 << (k - 1); i & j; j >>= 1)

@@ -1178,7 +1178,7 @@ static int
 test_zlib_header (grub_gzio_t gzio)
 {
   grub_uint8_t cmf, flg;
-  
+
   cmf = get_byte (gzio);
   flg = get_byte (gzio);
 

@@ -1345,7 +1345,7 @@ grub_deflate_decompress (char *inbuf, grub_size_t insize, grub_off_t off,
   return ret;
 }
 
-
+
 
 static struct grub_fs grub_gzio_fs =
   {

index 2a9f87c..fdce592 100644
@@ -314,7 +314,7 @@ extern void (*EXPORT_VAR (grub_xputs)) (const char *str);
 static inline int
 grub_puts (const char *s)
 {
-  const char nl[2] = "\n";
+  const char *nl = "\n";
   grub_xputs (s);
   grub_xputs (nl);