9:40 a.m.
From fed1a1abfd2b9ece7bd8e44aae13de91eaad4f5d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 7 May 2008 23:12:13 +0200
Subject: [PATCH] add "const" to file-scoped statics
These were relatively new additions to the list from here:
nm src/*.o|grep ' D '.
This is another test that should be automatic...
---
src/storage_backend_fs.c | 2 +-
src/xend_internal.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c
index d0eb32a..b41b952 100644
--- a/src/storage_backend_fs.c
+++ b/src/storage_backend_fs.c
@@ -79,7 +79,7 @@ enum {
};
/* Either 'magic' or 'extension' *must* be provided */
-struct {
+static const struct {
int type; /* One of the constants above */
const char *magic; /* Optional string of file magic
* to check at head of file */
diff --git a/src/xend_internal.c b/src/xend_internal.c
index f9db571..dd3ade6 100644
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -854,7 +854,7 @@ urlencode(const char *string)
#endif /* ! PROXY */
/* Applicable sound models */
-const char *sound_models[] = { "sb16", "es1370" };
+static const char *const sound_models[] = { "sb16", "es1370" };
/**
* is_sound_model_valid:
--
1.5.5.1.148.gbc1be
9:41 a.m.
On Thu, May 08, 2008 at 04:40:11PM +0200, Jim Meyering wrote:
>From fed1a1abfd2b9ece7bd8e44aae13de91eaad4f5d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Wed, 7 May 2008 23:12:13 +0200
Subject: [PATCH] add "const" to file-scoped statics
These were relatively new additions to the list from here:
nm src/*.o|grep ' D '.
ACK
Dan
--
|: Red Hat, Engineering, Boston -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
3:08 a.m.
"Daniel P. Berrange" <berrange(a)redhat.com> wrote:
On Thu, May 08, 2008 at 04:40:11PM +0200, Jim Meyering wrote:
> >From fed1a1abfd2b9ece7bd8e44aae13de91eaad4f5d Mon Sep 17 00:00:00 2001
> From: Jim Meyering <meyering(a)redhat.com>
> Date: Wed, 7 May 2008 23:12:13 +0200
> Subject: [PATCH] add "const" to file-scoped statics
>
> These were relatively new additions to the list from here:
> nm src/*.o|grep ' D '.
ACK
Thanks for the quick feedback.
I've pushed that and one more small change corresponding
to this ChangeLog entry:
It adds one more "const" and gives the struct type a name.
* src/storage_backend_fs.c (fileTypeInfo): Add "static" and two
"const" attributes.
(FileTypeInfo): Name the previously anonymous struct,
so the declaration of fileTypeInfo looks more conventional.
* src/xend_internal.c (sound_models): Mark as static, and
as an array of "const" entries.
These were relatively new additions to the list from here:
nm src/*.o|grep ' D '
From 550f475b6a33aa06e103329696be4f55c1b3c81d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering(a)redhat.com>
Date: Fri, 9 May 2008 10:05:58 +0200
Subject: [PATCH] complete the previous change
---
src/storage_backend_fs.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c
index b41b952..36f1fb8 100644
--- a/src/storage_backend_fs.c
+++ b/src/storage_backend_fs.c
@@ -79,7 +79,7 @@ enum {
};
/* Either 'magic' or 'extension' *must* be provided */
-static const struct {
+struct FileTypeInfo {
int type; /* One of the constants above */
const char *magic; /* Optional string of file magic
* to check at head of file */
@@ -94,7 +94,8 @@ static const struct {
* -1 to use st_size as capacity */
int sizeBytes; /* Number of bytes for size field */
int sizeMultiplier; /* A scaling factor if size is not in bytes */
-} fileTypeInfo[] = {
+};
+const struct FileTypeInfo const fileTypeInfo[] = {
/* Bochs */
/* XXX Untested
{ VIR_STORAGE_VOL_BOCHS, "Bochs Virtual HD Image", NULL,
--
1.5.5.1.179.gdc42
6041
days inactive
6042
days old
2 comments
2 participants
participants (2)
-
Daniel P. Berrange -
Jim Meyering