Some more printf-like functions replaced by fputs, puts and putchar. I
have tried to avoid any re-formatting than what was absolutely
necessary to preserve the formatting of the code after making the
changes.
Comments?
Happy hacking,
Debarshi
--
GPG key ID: 63D4A5A7
Key server: pgp.mit.edu
diff --git a/libparted/exception.c b/libparted/exception.c
index 8c71aab..d109209 100644
--- a/libparted/exception.c
+++ b/libparted/exception.c
@@ -262,7 +262,7 @@ ped_exception_throw (PedExceptionType ex_type,
return do_throw ();
no_memory:
- fprintf (stderr, "Out of memory in exception handler!\n");
+ fputs ("Out of memory in exception handler!\n", stderr);
va_start (arg_list, message);
vfprintf (stderr, message, arg_list);
diff --git a/libparted/fs/ext2/ext2_buffer.c b/libparted/fs/ext2/ext2_buffer.c
index b23dd93..85da20a 100644
--- a/libparted/fs/ext2/ext2_buffer.c
+++ b/libparted/fs/ext2/ext2_buffer.c
@@ -248,7 +248,7 @@ void ext2_bcache_dump(struct ext2_fs *fs)
{
int i;
- fprintf(stderr, "buffer cache dump:\n");
+ fputs ("buffer cache dump:\n", stderr);
for (i=0;i<(1<<ext2_hash_bits);i++)
if (fs->bc->hash[i] != NULL)
@@ -265,7 +265,7 @@ void ext2_bcache_dump(struct ext2_fs *fs)
a = a->next;
} while (a != b);
- fprintf(stderr, "\n");
+ fputc ('\n', stderr);
}
}
diff --git a/libparted/fs/ext2/ext2_inode_relocator.c b/libparted/fs/ext2/ext2_inode_relocator.c
index 296650d..d8e7e03 100644
--- a/libparted/fs/ext2/ext2_inode_relocator.c
+++ b/libparted/fs/ext2/ext2_inode_relocator.c
@@ -309,7 +309,7 @@ static int doscan(struct ext2_fs *fs, struct ext2_inode_relocator_state *state)
}
if (fs->opt_verbose)
- fprintf(stderr, "\n");
+ fputc ('\n', stderr);
return 1;
}
@@ -334,7 +334,7 @@ static int ext2_inode_relocator_copy(struct ext2_fs *fs, struct ext2_inode_reloc
if (fs->opt_debug)
if (!ext2_get_inode_state(fs, entry->num) ||
ext2_get_inode_state(fs, entry->dest))
- fprintf(stderr, "inodebitmaperror\n");
+ fputs ("inodebitmaperror\n", stderr);
if (!ext2_read_inode(fs, entry->num, &buf))
return 0;
@@ -408,7 +408,7 @@ static int ext2_inode_relocator_ref(struct ext2_fs *fs, struct ext2_inode_reloca
if (numerrors++ < 4)
continue;
- fprintf(stderr, "all is not well!\n");
+ fputs ("all is not well!\n", stderr);
return 0;
}
}
@@ -565,7 +565,7 @@ int ext2_inode_relocate(struct ext2_fs *fs, int newgroups)
struct ext2_inode_relocator_state state;
if (fs->opt_verbose)
- fprintf(stderr, "ext2_inode_relocate\n");
+ fputs ("ext2_inode_relocate\n", stderr);
state.usedentries = 0;
state.resolvedentries = 0;
diff --git a/libparted/fs/ext2/ext2_meta.c b/libparted/fs/ext2/ext2_meta.c
index 5d75fc5..d48097c 100644
--- a/libparted/fs/ext2/ext2_meta.c
+++ b/libparted/fs/ext2/ext2_meta.c
@@ -139,7 +139,7 @@ int ext2_metadata_push(struct ext2_fs *fs, blk_t newsize)
fs->itoffset = newitoffset;
if (fs->opt_verbose)
- fprintf(stderr, "\n");
+ fputc ('\n', stderr);
return 1;
}
diff --git a/libparted/fs/ext2/ext2_resize.c b/libparted/fs/ext2/ext2_resize.c
index faea7e3..960e54a 100644
--- a/libparted/fs/ext2/ext2_resize.c
+++ b/libparted/fs/ext2/ext2_resize.c
@@ -18,7 +18,7 @@
*/
#include <config.h>
-
+v
#ifndef DISCOVER_ONLY
#include <stdio.h>
@@ -34,7 +34,7 @@ static int ext2_add_group(struct ext2_fs *fs, blk_t groupsize)
int sparse;
if (fs->opt_verbose)
- fprintf(stderr, "ext2_add_group\n");
+ fputs ("ext2_add_group\n", stderr);
if (!ped_realloc ((void*) &fs->gd,
(fs->numgroups+1) * sizeof(struct ext2_group_desc)
@@ -47,9 +47,8 @@ static int ext2_add_group(struct ext2_fs *fs, blk_t groupsize)
EXT2_SUPER_FIRST_DATA_BLOCK(fs->sb)
+ fs->numgroups * EXT2_SUPER_BLOCKS_PER_GROUP(fs->sb))
{
- fprintf(stderr,
- "ext2_add_group: last (existing) group "
- "isn't complete!\n");
+ fputs ("ext2_add_group: last (existing) group "
+ "isn't complete!\n", stderr);
return 0;
}
@@ -205,7 +204,7 @@ static int ext2_del_group(struct ext2_fs *fs)
int sparse;
if (fs->opt_verbose)
- fprintf(stderr, "ext2_del_group\n");
+ fputs ("ext2_del_group\n", stderr);
group = fs->numgroups - 1;
sparse = ext2_is_group_sparse(fs, group);
@@ -240,9 +239,8 @@ static int ext2_del_group(struct ext2_fs *fs)
if (EXT2_GROUP_FREE_INODES_COUNT(fs->gd[group]) !=
EXT2_SUPER_INODES_PER_GROUP(fs->sb))
{
- fprintf(stderr,
- "ext2_del_group: this should not "
- "happen anymore!\n");
+ fputs ("ext2_del_group: this should not "
+ "happen anymore!\n", stderr);
return 0;
}
@@ -333,7 +331,7 @@ static int ext2_grow_group(struct ext2_fs *fs, blk_t newsize)
blk_t i;
if (fs->opt_verbose)
- fprintf(stderr, "ext2_grow_group\n");
+ fputs ("ext2_grow_group\n", stderr);
group = fs->numgroups - 1;
groupoff = group * EXT2_SUPER_BLOCKS_PER_GROUP(fs->sb)
@@ -344,15 +342,15 @@ static int ext2_grow_group(struct ext2_fs *fs, blk_t newsize)
{
if (newsize < gblocks)
{
- fprintf(stderr,
- "ext2_grow_group: called to shrink group!\n");
+ fputs ("ext2_grow_group: called to shrink group!\n",
+ stderr);
return 0;
}
if (gblocks == newsize)
{
- fprintf(stderr, "ext2_grow_group: nothing to do!\n");
+ fputs ("ext2_grow_group: nothing to do!\n", stderr);
return 0;
}
}
@@ -379,7 +377,7 @@ static int ext2_shrink_group(struct ext2_fs *fs, blk_t newsize)
blk_t i;
if (fs->opt_verbose)
- fprintf(stderr, "ext2_shrink_group\n");
+ fputs ("ext2_shrink_group\n", stderr);
group = fs->numgroups - 1;
@@ -404,16 +402,16 @@ static int ext2_shrink_group(struct ext2_fs *fs, blk_t newsize)
if (newsize > gblocks)
{
- fprintf(stderr,
- "ext2_shrink_group: called to grow group!\n");
+ fputs ("ext2_shrink_group: called to grow group!\n",
+ stderr);
return 0;
}
if (gblocks == newsize)
{
- fprintf(stderr,
- "ext2_shrink_group: nothing to do!\n");
+ fputs ("ext2_shrink_group: nothing to do!\n",
+ stderr);
return 0;
}
@@ -462,7 +460,7 @@ static int ext2_grow_fs(struct ext2_fs *fs, blk_t newsize, PedTimer* timer)
blk_t origsize = EXT2_SUPER_BLOCKS_COUNT(fs->sb);
if (fs->opt_verbose)
- fprintf(stderr, "ext2_grow_fs\n");
+ fputs ("ext2_grow_fs\n", stderr);
if (!ext2_block_relocate(fs, newsize))
return 0;
@@ -518,7 +516,7 @@ static int ext2_shrink_fs(struct ext2_fs *fs, blk_t newsize,
blk_t sizelast;
if (fs->opt_verbose)
- fprintf(stderr, "ext2_shrink_fs\n");
+ fputs ("ext2_shrink_fs\n", stderr);
newgroups = ped_div_round_up (newsize
- EXT2_SUPER_FIRST_DATA_BLOCK(fs->sb),
@@ -703,7 +701,7 @@ int ext2_resize_fs(struct ext2_fs *fs, blk_t newsize, PedTimer* timer)
}
if (fs->opt_verbose)
- fprintf(stderr, "ext2_resize_fs\n");
+ fputs ("ext2_resize_fs\n", stderr);
residue = (newsize - EXT2_SUPER_FIRST_DATA_BLOCK(fs->sb))
% EXT2_SUPER_BLOCKS_PER_GROUP(fs->sb);
diff --git a/libparted/fs/fat/count.c b/libparted/fs/fat/count.c
index 7390948..1909c45 100644
--- a/libparted/fs/fat/count.c
+++ b/libparted/fs/fat/count.c
@@ -112,11 +112,11 @@ print_chain (PedFileSystem* fs, FatCluster start)
clst = fat_table_get (fs_info->fat, clst)) {
printf (" %d", (int) clst);
if (++this_row == 7) {
- printf ("\n");
+ putchar ('\n');
this_row = 0;
}
}
- printf ("\n");
+ putchar ('\n');
}
#endif /* PED_VERBOSE */
diff --git a/libparted/labels/vtoc.c b/libparted/labels/vtoc.c
index 028f8b0..5898573 100644
--- a/libparted/labels/vtoc.c
+++ b/libparted/labels/vtoc.c
@@ -730,8 +730,8 @@ vtoc_update_format5_label_add (format5_label_t *f5, int verbose, int cyl,
if (((a < ext->t) && (a + b*trk + c > ext->t)) ||
((a > ext->t) && (ext->t + ext->fc*trk + ext->ft > a)))
{
- printf("BUG: overlapping free space extents " \
- "in FMT5 DSCB!\nexiting...\n");
+ puts ("BUG: overlapping free space extents "
+ "in FMT5 DSCB!\nexiting...");
exit(1);
}
@@ -741,15 +741,14 @@ vtoc_update_format5_label_add (format5_label_t *f5, int verbose, int cyl,
ext->ft = c;
tmp = ext;
if (verbose)
- printf("FMT5 add extent: " \
- "add new extent\n");
+ puts ("FMT5 add extent: add new extent");
break;
}
}
if (tmp == NULL) {
/* BUG: no free extent found */
- printf("BUG: no free FMT5 DSCB extent found!\nexiting...\n");
+ puts ("BUG: no free FMT5 DSCB extent found!\nexiting...");
exit(1);
}
@@ -772,8 +771,8 @@ vtoc_update_format5_label_add (format5_label_t *f5, int verbose, int cyl,
tmp = ext;
if (verbose)
- printf("FMT5 add extent: " \
- "merge with predecessor\n");
+ puts ("FMT5 add extent: "
+ "merge with predecessor");
i = -1;
continue;
@@ -788,8 +787,8 @@ vtoc_update_format5_label_add (format5_label_t *f5, int verbose, int cyl,
tmp = ext;
if (verbose)
- printf("FMT5 add extent: " \
- "merge with successor\n");
+ puts ("FMT5 add extent: "
+ "merge with successor");
i = -1;
continue;
@@ -821,7 +820,7 @@ vtoc_update_format5_label_del (format5_label_t *f5, int verbose, int cyl,
bzero(ext, sizeof(ds5ext_t));
if (verbose)
- printf("FMT5 del extent: fills whole gap\n");
+ puts ("FMT5 del extent: fills whole gap");
counter++;
break;
@@ -840,7 +839,7 @@ vtoc_update_format5_label_del (format5_label_t *f5, int verbose, int cyl,
}
if (verbose)
- printf("FMT5 del extent: left bounded\n");
+ puts ("FMT5 del extent: left bounded");
counter++;
break;
@@ -859,7 +858,7 @@ vtoc_update_format5_label_del (format5_label_t *f5, int verbose, int cyl,
}
if (verbose)
- printf("FMT5 del extent: right bounded\n");
+ puts ("FMT5 del extent: right bounded");
counter++;
break;
@@ -884,7 +883,7 @@ vtoc_update_format5_label_del (format5_label_t *f5, int verbose, int cyl,
cyl, trk, x, y, z);
if (verbose)
- printf("FMT5 del extent: 2 pieces\n");
+ puts ("FMT5 del extent: 2 pieces");
counter++;
break;
@@ -893,19 +892,19 @@ vtoc_update_format5_label_del (format5_label_t *f5, int verbose, int cyl,
if ((a < ext->t) && (a + b*trk + c > ext->t)
&& (a + b*trk + c < ext->t + ext->fc*trk + ext->ft))
{
- printf("BUG: corresponding free space extent " \
- "doesn't match free space currently shown " \
- "in FMT5 DSCB!\nexiting...\n");
+ puts ("BUG: corresponding free space extent "
+ "doesn't match free space currently shown "
+ "in FMT5 DSCB!\nexiting...");
exit(1);
}
if ((a > ext->t) && (a < ext->t + ext->fc*trk + ext->ft)
&& (a + b*trk + c > ext->t + ext->fc*trk + ext->ft))
{
- printf("BUG: specified free space extent for " \
- "deleting doesn't match free space " \
- "currently shown in FMT5 DSCB!\n" \
- "exiting...\n");
+ puts ("BUG: specified free space extent for "
+ "deleting doesn't match free space "
+ "currently shown in FMT5 DSCB!\n"
+ "exiting...");
exit(1);
}
}
@@ -913,9 +912,9 @@ vtoc_update_format5_label_del (format5_label_t *f5, int verbose, int cyl,
if (counter > 0)
return;
- printf("BUG: specified free space extent for " \
- "deleting not found in FMT5 DSCB!\n" \
- "exiting...\n");
+ puts ("BUG: specified free space extent for "
+ "deleting not found in FMT5 DSCB!\n"
+ "exiting...");
exit(1);
}
@@ -975,8 +974,8 @@ vtoc_update_format7_label_add (format7_label_t *f7, int verbose,
if (((a < ext->a) && (b > ext->a) && (b < ext->b))
|| ((a > ext->a) && (a < ext->b) && (b > ext->b)))
{
- printf("BUG: overlapping free space extents " \
- "in FMT7 DSCB!\nexiting...\n");
+ puts ("BUG: overlapping free space extents "
+ "in FMT7 DSCB!\nexiting...");
exit(1);
}
@@ -986,8 +985,7 @@ vtoc_update_format7_label_add (format7_label_t *f7, int verbose,
tmp = ext;
if (verbose)
- printf("FMT7 add extent: " \
- "add new extent\n");
+ puts ("FMT7 add extent: add new extent");
break;
}
@@ -995,7 +993,7 @@ vtoc_update_format7_label_add (format7_label_t *f7, int verbose,
if (tmp == NULL) {
/* BUG: no free extent found */
- printf("BUG: no free FMT7 DSCB extent found!\nexiting...\n");
+ puts ("BUG: no free FMT7 DSCB extent found!\nexiting...");
exit(1);
}
@@ -1015,8 +1013,8 @@ vtoc_update_format7_label_add (format7_label_t *f7, int verbose,
tmp = ext;
if (verbose)
- printf("FMT7 add extent: " \
- "merge with predecessor\n");
+ puts ("FMT7 add extent: "
+ "merge with predecessor");
i = -1;
continue;
@@ -1029,8 +1027,7 @@ vtoc_update_format7_label_add (format7_label_t *f7, int verbose,
tmp = ext;
if (verbose)
- printf("FMT7 add extent: " \
- "merge with successor\n");
+ puts ("FMT7 add extent: merge with successor");
i = -1;
continue;
@@ -1060,8 +1057,7 @@ vtoc_update_format7_label_del (format7_label_t *f7, int verbose,
bzero(ext, sizeof(ds7ext_t));
if (verbose)
- printf("FMT7 del extent: " \
- "fills whole gap\n");
+ puts ("FMT7 del extent: fills whole gap");
counter++;
break;
@@ -1072,8 +1068,7 @@ vtoc_update_format7_label_del (format7_label_t *f7, int verbose,
ext->a = b + 1;
if (verbose)
- printf("FMT7 add extent: " \
- "left-bounded\n");
+ puts ("FMT7 add extent: left-bounded");
counter++;
break;
@@ -1084,8 +1079,7 @@ vtoc_update_format7_label_del (format7_label_t *f7, int verbose,
ext->b = a - 1;
if (verbose)
- printf("FMT7 add extent: " \
- "right-bounded\n");
+ puts ("FMT7 add extent: right-bounded");
counter++;
break;
@@ -1097,17 +1091,16 @@ vtoc_update_format7_label_del (format7_label_t *f7, int verbose,
ext->b = a - 1;
if (verbose)
- printf("FMT7 add extent: " \
- "2 pieces\n");
+ puts ("FMT7 add extent: 2 pieces");
counter++;
break;
}
if (((a < ext->a) && (b > ext->a)) || ((a < ext->b) && (b > ext->b))) {
- printf ("BUG: specified free space extent for deleting "
- "doesn't match free space currently shown in "
- "FMT7 DSCB!\nexiting...\n");
+ puts ("BUG: specified free space extent for deleting "
+ "doesn't match free space currently shown in "
+ "FMT7 DSCB!\nexiting...");
printf ("%d %d %d %d\n", a, b, ext->a, ext->b);
exit(1);
}
@@ -1116,9 +1109,9 @@ vtoc_update_format7_label_del (format7_label_t *f7, int verbose,
if (counter > 0)
return;
- printf("BUG: specified free space extent for " \
- "deleting not found in FMT7 DSCB!\n" \
- "exiting...\n");
+ puts ("BUG: specified free space extent for "
+ "deleting not found in FMT7 DSCB!\n"
+ "exiting...");
exit(1);
}
@@ -1134,8 +1127,7 @@ vtoc_set_freespace(format4_label_t *f4, format5_label_t *f5,
else if (ch == '-')
vtoc_update_format7_label_del(f7, verbose, start, stop);
else
- printf("BUG: syntax error in " \
- "vtoc_set_freespace call\n");
+ puts ("BUG: syntax error in vtoc_set_freespace call");
vtoc_reorganize_FMT7_extents (f7);
@@ -1155,8 +1147,7 @@ vtoc_set_freespace(format4_label_t *f4, format5_label_t *f5,
else if (ch == '-')
vtoc_update_format5_label_del(f5, verbose, cyl, trk, x, y, z);
else
- printf("BUG: syntax error in " \
- "vtoc_set_freespace call\n");
+ puts ("BUG: syntax error in vtoc_set_freespace call");
vtoc_reorganize_FMT5_extents (f5);
}
diff --git a/parted/command.c b/parted/command.c
index c3c897f..7ce9090 100644
--- a/parted/command.c
+++ b/parted/command.c
@@ -118,9 +118,9 @@ command_get_names (Command** list)
void
command_print_summary (Command* cmd)
{
- printf (" ");
+ fputs (" ", stdout);
str_list_print_wrap (cmd->summary, screen_width(), 2, 8);
- printf ("\n");
+ putchar ('\n');
}
void
@@ -128,7 +128,7 @@ command_print_help (Command* cmd)
{
command_print_summary (cmd);
if (cmd->help) {
- printf ("\n\t");
+ fputs ("\n\t", stdout);
str_list_print_wrap (cmd->help, screen_width(), 8, 8);
}
}
diff --git a/parted/parted.c b/parted/parted.c
index 1d7753b..fb23462 100644
--- a/parted/parted.c
+++ b/parted/parted.c
@@ -1185,28 +1185,28 @@ partition_print (PedPartition* part)
if (!fs)
return 1;
- printf ("\n");
+ putchar ('\n');
flags = partition_print_flags (part);
printf (_("Minor: %d\n"), part->num);
printf (_("Flags: %s\n"), flags);
printf (_("File System: %s\n"), fs->type->name);
- printf (_("Size: "));
+ fputs (_("Size: "), stdout);
print_sector_compact_and_percent (part->geom.length, part->geom.dev);
resize_constraint = ped_file_system_get_resize_constraint (fs);
if (resize_constraint) {
- printf (_("Minimum size: "));
+ fputs (_("Minimum size: "), stdout);
print_sector_compact_and_percent (resize_constraint->min_size,
part->geom.dev);
- printf (_("Maximum size: "));
+ fputs (_("Maximum size: "), stdout);
print_sector_compact_and_percent (resize_constraint->max_size,
part->geom.dev);
ped_constraint_destroy (resize_constraint);
}
- printf ("\n");
+ putchar ('\n');
ped_free (flags);
ped_file_system_close (fs);
@@ -1308,11 +1308,11 @@ do_print (PedDevice** dev)
if (opt_machine_mode) {
switch (ped_unit_get_default ()) {
- case PED_UNIT_CHS: printf ("CHS;\n");
+ case PED_UNIT_CHS: puts ("CHS;");
break;
- case PED_UNIT_CYLINDER: printf ("CYL;\n");
+ case PED_UNIT_CYLINDER: puts ("CYL;");
break;
- default: printf ("BYT;\n");
+ default: puts ("BYT;");
break;
}
@@ -1352,7 +1352,7 @@ do_print (PedDevice** dev)
if (!opt_machine_mode) {
printf (_("Partition Table: %s\n"), disk->type->name);
- printf ("\n");
+ putchar ('\n');
}
has_extended = ped_disk_type_check_feature (disk->type,
@@ -1468,7 +1468,7 @@ do_print (PedDevice** dev)
if (part->num >= 0)
printf ("%d:", part->num);
else
- printf ("1:");
+ fputs ("1:", stdout);
printf ("%s:", ped_unit_format (*dev, part->geom.start));
printf ("%s:", ped_unit_format_byte (
@@ -1485,17 +1485,17 @@ do_print (PedDevice** dev)
if (part->fs_type)
printf ("%s:", part->fs_type->name);
else
- printf (":");
+ putchar (':');
if (has_name)
printf ("%s:", _(ped_partition_get_name (part)));
else
- printf (":");
+ putchar (':');
printf ("%s;\n", partition_print_flags (part));
} else {
- printf ("free;\n");
+ puts ("free;");
}
}
}
@@ -1518,7 +1518,7 @@ _print_list (int cli)
while ((current_dev = ped_device_get_next(current_dev))) {
do_print (¤t_dev);
- printf ("\n");
+ putchar ('\n');
}
if(cli)
@@ -2332,8 +2332,8 @@ if (!_parse_options (argc_ptr, argv_ptr))
#ifdef HAVE_GETUID
if (getuid() != 0) {
- printf(_("WARNING: You are not superuser. Watch out for "
- "permissions.\n"));
+ puts (_("WARNING: You are not superuser. Watch out for "
+ "permissions."));
}
#endif
diff --git a/parted/strlist.c b/parted/strlist.c
index 9f43972..da1b09f 100644
--- a/parted/strlist.c
+++ b/parted/strlist.c
@@ -513,7 +513,7 @@ str_list_print_wrap (const StrList* list, int line_length, int offset,
if (walk->next || *str)
printf ("\n%s", spaces);
else if (line_break)
- printf ("\n");
+ putchar ('\n');
}
print_wchar (str, 0);
diff --git a/parted/table.c b/parted/table.c
index 8b803fe..3b89e6d 100644
--- a/parted/table.c
+++ b/parted/table.c
@@ -141,10 +141,10 @@ void table_add_row (Table* t, wchar_t** row)
assert(t);
/*unsigned int i;
- printf("adding row: ");
+ fputs ("adding row: ", stdout);
for (i = 0; i < t->ncols; ++i)
printf("[%s]", row[i]);
- printf("\n");*/
+ putchar ('\n');*/
t->rows = (wchar_t***)realloc (t->rows, (t->nrows + 1)
* sizeof(wchar_t***));
_______________________________________________
parted-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/parted-devel
