From: Carlos Maiolino <cmaiolino@redhat.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH] mkfs: Remove duplicated code from verify_bsize()
Date: Tue, 12 Jul 2011 11:06:19 -0300 [thread overview]
Message-ID: <1310479579-12731-1-git-send-email-cmaiolino@redhat.com> (raw)
Although are_you_sure() function adds some little extra overhead due some
extra checks, use this function instead of duplicate code is worth.
The extra security checks and the additional overhead will not be
noticed by the user.
This is the first try of this patch, but I think the good way to do that
is to move are_you_sure() and some related functions to libgfs2.
---
gfs2/mkfs/main_mkfs.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
index b0bb6e3..315f191 100644
--- a/gfs2/mkfs/main_mkfs.c
+++ b/gfs2/mkfs/main_mkfs.c
@@ -26,6 +26,9 @@
#include "libgfs2.h"
#include "gfs2_mkfs.h"
+/*Function prototypes*/
+static void are_you_sure(struct gfs2_sbd *sdp);
+
int discard = 1;
/**
@@ -317,14 +320,7 @@ static void verify_bsize(struct gfs2_sbd *sdp)
if (sdp->override)
return;
- printf( _("\nAre you sure you want to proceed? [y/n] "));
- if(!fgets(input, 32, stdin))
- die( _("unable to read from stdin\n"));
-
- if (input[0] != 'y')
- die( _("aborted\n"));
- else
- printf("\n");
+ are_you_sure(sdp);
}
}
--
1.7.5.2
next reply other threads:[~2011-07-12 14:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-12 14:06 Carlos Maiolino [this message]
2011-07-12 14:26 ` [Cluster-devel] [PATCH] mkfs: Remove duplicated code from verify_bsize() Steven Whitehouse
2011-07-12 14:37 ` Andrew Price
2011-07-18 18:44 ` Carlos Maiolino
2011-07-19 9:40 ` Steven Whitehouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310479579-12731-1-git-send-email-cmaiolino@redhat.com \
--to=cmaiolino@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).