[BACK]Return to chfs_mkfs.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / usr.sbin / makefs / chfs

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/usr.sbin/makefs/chfs/chfs_mkfs.c between version 1.2 and 1.3

version 1.2, 2012/04/19 17:09:53 version 1.3, 2012/04/19 17:28:26
Line 100  padword(fsinfo_t *fsopts)
Line 100  padword(fsinfo_t *fsopts)
 static void  static void
 pad_block_if_less_than(fsinfo_t *fsopts, int req)  pad_block_if_less_than(fsinfo_t *fsopts, int req)
 {  {
         if ((img_ofs % chfs_opts.eraseblock) + req > chfs_opts.eraseblock) {          if ((img_ofs % chfs_opts.eraseblock) + req >
               (uint32_t)chfs_opts.eraseblock) {
                 padblock(fsopts);                  padblock(fsopts);
                 write_eb_header(fsopts);                  write_eb_header(fsopts);
         }          }
Line 117  write_eb_header(fsinfo_t *fsopts)
Line 118  write_eb_header(fsinfo_t *fsopts)
   
 #define MINSIZE MAX(MAX(CHFS_EB_EC_HDR_SIZE, CHFS_EB_HDR_NOR_SIZE), \  #define MINSIZE MAX(MAX(CHFS_EB_EC_HDR_SIZE, CHFS_EB_HDR_NOR_SIZE), \
     CHFS_EB_HDR_NAND_SIZE)      CHFS_EB_HDR_NAND_SIZE)
         if (opts->pagesize < MINSIZE)          if ((uint32_t)opts->pagesize < MINSIZE)
                 errx(EXIT_FAILURE, "pagesize cannot be less than %zu", MINSIZE);                  errx(EXIT_FAILURE, "pagesize cannot be less than %zu", MINSIZE);
         if ((buf = malloc(opts->pagesize)) == NULL)          if ((buf = malloc(opts->pagesize)) == NULL)
                 err(EXIT_FAILURE, "Memory allocation failed");                  err(EXIT_FAILURE, "Memory allocation failed");
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3
CVSweb <webmaster@jp.NetBSD.org>