util-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] swapon: kill unused variables in show_table()
@ 2012-07-12  8:09 Petr Uzel
  2012-07-12  8:09 ` [PATCH 2/2] libblkid: cast blkid_loff_t to unsigned long long Petr Uzel
  2012-07-16 16:24 ` [PATCH 1/2] swapon: kill unused variables in show_table() Karel Zak
  0 siblings, 2 replies; 4+ messages in thread
From: Petr Uzel @ 2012-07-12  8:09 UTC (permalink / raw)
  To: util-linux


Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---
 sys-utils/swapon.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/sys-utils/swapon.c b/sys-utils/swapon.c
index 0858894..05d025c 100644
--- a/sys-utils/swapon.c
+++ b/sys-utils/swapon.c
@@ -216,7 +216,6 @@ static int show_table(int tt_flags, int bytes)
 	struct libmnt_fs *fs;
 
 	int i, rc = 0;
-	struct list_head *p, *pnext;
 	struct tt *tt;
 
 	if (!st)
-- 
1.7.7


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] libblkid: cast blkid_loff_t to unsigned long long
  2012-07-12  8:09 [PATCH 1/2] swapon: kill unused variables in show_table() Petr Uzel
@ 2012-07-12  8:09 ` Petr Uzel
  2012-07-16 16:24   ` Karel Zak
  2012-07-16 16:24 ` [PATCH 1/2] swapon: kill unused variables in show_table() Karel Zak
  1 sibling, 1 reply; 4+ messages in thread
From: Petr Uzel @ 2012-07-12  8:09 UTC (permalink / raw)
  To: util-linux

Get rid of gcc warning and fix build with -Werror

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---
 libblkid/src/probe.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c
index 33220df..7c1a020 100644
--- a/libblkid/src/probe.c
+++ b/libblkid/src/probe.c
@@ -1256,7 +1256,7 @@ int blkid_probe_set_magic(blkid_probe pr, blkid_loff_t offset,
 		rc = blkid_probe_set_value(pr, "SBMAGIC", magic, len);
 		if (!rc)
 			rc = blkid_probe_sprintf_value(pr,
-					"SBMAGIC_OFFSET", "%llu", offset);
+					"SBMAGIC_OFFSET", "%llu", (unsigned long long)offset);
 		break;
 	case BLKID_CHAIN_PARTS:
 		if (!(chn->flags & BLKID_PARTS_MAGIC))
@@ -1264,7 +1264,7 @@ int blkid_probe_set_magic(blkid_probe pr, blkid_loff_t offset,
 		rc = blkid_probe_set_value(pr, "PTMAGIC", magic, len);
 		if (!rc)
 			rc = blkid_probe_sprintf_value(pr,
-					"PTMAGIC_OFFSET", "%llu", offset);
+					"PTMAGIC_OFFSET", "%llu", (unsigned long long)offset);
 		break;
 	default:
 		break;
-- 
1.7.7


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] swapon: kill unused variables in show_table()
  2012-07-12  8:09 [PATCH 1/2] swapon: kill unused variables in show_table() Petr Uzel
  2012-07-12  8:09 ` [PATCH 2/2] libblkid: cast blkid_loff_t to unsigned long long Petr Uzel
@ 2012-07-16 16:24 ` Karel Zak
  1 sibling, 0 replies; 4+ messages in thread
From: Karel Zak @ 2012-07-16 16:24 UTC (permalink / raw)
  To: Petr Uzel; +Cc: util-linux

On Thu, Jul 12, 2012 at 10:09:58AM +0200, Petr Uzel wrote:
>  sys-utils/swapon.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] libblkid: cast blkid_loff_t to unsigned long long
  2012-07-12  8:09 ` [PATCH 2/2] libblkid: cast blkid_loff_t to unsigned long long Petr Uzel
@ 2012-07-16 16:24   ` Karel Zak
  0 siblings, 0 replies; 4+ messages in thread
From: Karel Zak @ 2012-07-16 16:24 UTC (permalink / raw)
  To: Petr Uzel; +Cc: util-linux

On Thu, Jul 12, 2012 at 10:09:59AM +0200, Petr Uzel wrote:
>  libblkid/src/probe.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-07-16 16:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-12  8:09 [PATCH 1/2] swapon: kill unused variables in show_table() Petr Uzel
2012-07-12  8:09 ` [PATCH 2/2] libblkid: cast blkid_loff_t to unsigned long long Petr Uzel
2012-07-16 16:24   ` Karel Zak
2012-07-16 16:24 ` [PATCH 1/2] swapon: kill unused variables in show_table() Karel Zak

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).