d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makefs: use unsigned and %u for rock_ridge_move_count

Browse Source 
For diff reduction against NetBSD's makefs.  Based on NetBSD git mirror
commit 00991aee8248.

With this change our makefs cd9660 support should be in sync up to
NetBSD commit bdae6c9dc792 ("makefs(8): Nix trailing whitespace.").

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2023-04-10 18:53:53 -04:00
parent 9742519b22
commit 10854bf517
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/makefs/cd9660.c
View File

@ -1255,7 +1255,7 @@ cd9660_rrip_move_directory(iso9660_disk *diskStructure, cd9660node *dir)
return NULL;
diskStructure->rock_ridge_move_count++;
snprintf(newname, sizeof(newname), "%08i",
snprintf(newname, sizeof(newname), "%08u",
diskStructure->rock_ridge_move_count);
/* Point to old parent */

2
usr.sbin/makefs/cd9660.h
View File

@ -249,7 +249,7 @@ typedef struct _iso9660_disk {
int rock_ridge_enabled;
/* Other Rock Ridge Variables */
char *rock_ridge_renamed_dir_name;
int rock_ridge_move_count;
unsigned rock_ridge_move_count;
cd9660node *rr_moved_dir;
int archimedes_enabled;