diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-03-26 09:12:56 +0100 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-03-26 09:12:56 +0100 |
commit | 5fd65297646a652277b57cf33e0d251b73b8c810 (patch) | |
tree | a6de0d6aa50365445eaab730a5a3ef97d885d70d | |
parent | 3520db8f47c1e46ec33e11aaea2063d8d53b2887 (diff) | |
parent | 7ae13f0b05fc8176e6b27ee784211ccb6806a187 (diff) | |
download | ptxdist-5fd65297646a652277b57cf33e0d251b73b8c810.tar.gz ptxdist-5fd65297646a652277b57cf33e0d251b73b8c810.tar.xz |
Merge branch 'patches/util-linux-ng' of git://github.com/ringlej/ptxdist
-rw-r--r-- | patches/util-linux-ng-2.17.1/0001-replace-bzero-with-memset.patch | 38 | ||||
-rw-r--r-- | patches/util-linux-ng-2.17.1/series | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/patches/util-linux-ng-2.17.1/0001-replace-bzero-with-memset.patch b/patches/util-linux-ng-2.17.1/0001-replace-bzero-with-memset.patch new file mode 100644 index 000000000..6951ae632 --- /dev/null +++ b/patches/util-linux-ng-2.17.1/0001-replace-bzero-with-memset.patch @@ -0,0 +1,38 @@ +From 06fe890db9b7798363b814269f2a6cc2ec594e8f Mon Sep 17 00:00:00 2001 +From: Jon Ringle <jon@ringle.org> +Date: Thu, 25 Mar 2010 22:38:53 -0400 +Subject: [PATCH] replace bzero with memset + +Work on this was done in commit c0f19ccff73aa0ec5e9f3b61b932ea4a8bf4e6ed, +however a couple of bzero call sites were missed + +Signed-off-by: Jon Ringle <jon@ringle.org> +--- + fdisk/fdiskbsdlabel.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fdisk/fdiskbsdlabel.c b/fdisk/fdiskbsdlabel.c +index 2f41561..9c09252 100644 +--- a/fdisk/fdiskbsdlabel.c ++++ b/fdisk/fdiskbsdlabel.c +@@ -540,7 +540,7 @@ xbsd_write_bootstrap (void) + memmove (&dl, d, sizeof (struct xbsd_disklabel)); + + /* The disklabel will be overwritten by 0's from bootxx anyway */ +- bzero (d, sizeof (struct xbsd_disklabel)); ++ memset (d, 0, sizeof (struct xbsd_disklabel)); + + snprintf (path, sizeof(path), "%s/boot%s", bootdir, dkbasename); + if (!xbsd_get_bootstrap (path, &disklabelbuffer[xbsd_dlabel.d_secsize], +@@ -656,7 +656,7 @@ xbsd_initlabel (struct partition *p, struct xbsd_disklabel *d, int pindex) { + struct geom g; + + get_geometry (fd, &g); +- bzero (d, sizeof (struct xbsd_disklabel)); ++ memset (d, 0, sizeof (struct xbsd_disklabel)); + + d -> d_magic = BSD_DISKMAGIC; + +-- +1.7.0.2.182.ge007 + diff --git a/patches/util-linux-ng-2.17.1/series b/patches/util-linux-ng-2.17.1/series new file mode 100644 index 000000000..80f9ac96a --- /dev/null +++ b/patches/util-linux-ng-2.17.1/series @@ -0,0 +1 @@ +0001-replace-bzero-with-memset.patch |