Menu
▾
▴
[MinGW-cvs] [git push mingw-get]Repository: mingw-get branch master updated. r0-5-beta-20120426-1-17-g87b151d
|
From: Keith M. <no...@so...> - 2012-09-02 20:42:40
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-get".
The branch, master has been updated
via 87b151d5e5e0a2bd16768080efa5d15bd76a5700 (commit)
via b413b3f30f7dbe27ce397807d448e656e36462c3 (commit)
from c402ccf194af8e7947b200a7594c1ec2b9fd4681 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=
commit 87b151d5e5e0a2bd16768080efa5d15bd76a5700
Author: Keith Marshall <kei...@us...>
Date: Sun Sep 2 21:39:58 2012 +0100
Redefine paragraph_key with project global scope.
diff --git a/ChangeLog b/ChangeLog
index 38ace31..06868b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2012-09-02 Keith Marshall <kei...@us...>
+ Redefine paragraph_key with project global scope.
+
+ * src/pkgkeys.h (paragraph_key): Declare it.
+ * src/pkgkeys.c (paragraph_key): Define it.
+
+ * src/pkgshow.cpp (pkgDirectoryViewer::EmitDescription): Delete
+ function local definition; use global definition instead.
+
+2012-09-02 Keith Marshall <kei...@us...>
+
Correct defect introduced by 2012-08-03 commit.
* src/approot.c (AppPathNameW): Add omitted 'else', so that tail
diff --git a/src/pkgkeys.c b/src/pkgkeys.c
index 45029b5..9a35a29 100644
--- a/src/pkgkeys.c
+++ b/src/pkgkeys.c
@@ -51,6 +51,7 @@ const char *name_key = "name";
const char *package_key = "package";
const char *package_collection_key = "package-collection";
const char *package_list_key = "package-list";
+const char *paragraph_key = "paragraph";
const char *pathname_key = "path";
const char *profile_key = "profile";
const char *reference_key = "references";
diff --git a/src/pkgkeys.h b/src/pkgkeys.h
index d7fca4f..09738e4 100644
--- a/src/pkgkeys.h
+++ b/src/pkgkeys.h
@@ -62,6 +62,7 @@ EXTERN_C_DECL const char *name_key;
EXTERN_C_DECL const char *package_key;
EXTERN_C_DECL const char *package_collection_key;
EXTERN_C_DECL const char *package_list_key;
+EXTERN_C_DECL const char *paragraph_key;
EXTERN_C_DECL const char *pathname_key;
EXTERN_C_DECL const char *profile_key;
EXTERN_C_DECL const char *reference_key;
diff --git a/src/pkgshow.cpp b/src/pkgshow.cpp
index 022dacf..9c5c28f 100644
--- a/src/pkgshow.cpp
+++ b/src/pkgshow.cpp
@@ -733,12 +733,6 @@ void pkgDirectoryViewer::EmitDescription( pkgXmlNode *pkg, const char *title )
*/
int offset = 0;
- /* This XML element and attribute identification key should
- * perhaps be defined in the pkgkeys.h header; once more, for
- * the time being we simply define it locally.
- */
- const char *paragraph_key = "paragraph";
-
/* The procedure is recursive, selecting description elements
* from inner levels of the XML document, progressing outward to
* the document root, then printing them in outer to inner order;
http://mingw.git.sourceforge.net/git/gitweb.cgi?p=mingw/mingw-get;a=commitdiff;h=
commit 87b151d5e5e0a2bd16768080efa5d15bd76a5700
Author: Keith Marshall <kei...@us...>
Date: Sun Sep 2 21:39:58 2012 +0100
Redefine paragraph_key with project global scope.
diff --git a/ChangeLog b/ChangeLog
index 38ace31..06868b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2012-09-02 Keith Marshall <kei...@us...>
+ Redefine paragraph_key with project global scope.
+
+ * src/pkgkeys.h (paragraph_key): Declare it.
+ * src/pkgkeys.c (paragraph_key): Define it.
+
+ * src/pkgshow.cpp (pkgDirectoryViewer::EmitDescription): Delete
+ function local definition; use global definition instead.
+
+2012-09-02 Keith Marshall <kei...@us...>
+
Correct defect introduced by 2012-08-03 commit.
* src/approot.c (AppPathNameW): Add omitted 'else', so that tail
diff --git a/src/pkgkeys.c b/src/pkgkeys.c
index 45029b5..9a35a29 100644
--- a/src/pkgkeys.c
+++ b/src/pkgkeys.c
@@ -51,6 +51,7 @@ const char *name_key = "name";
const char *package_key = "package";
const char *package_collection_key = "package-collection";
const char *package_list_key = "package-list";
+const char *paragraph_key = "paragraph";
const char *pathname_key = "path";
const char *profile_key = "profile";
const char *reference_key = "references";
diff --git a/src/pkgkeys.h b/src/pkgkeys.h
index d7fca4f..09738e4 100644
--- a/src/pkgkeys.h
+++ b/src/pkgkeys.h
@@ -62,6 +62,7 @@ EXTERN_C_DECL const char *name_key;
EXTERN_C_DECL const char *package_key;
EXTERN_C_DECL const char *package_collection_key;
EXTERN_C_DECL const char *package_list_key;
+EXTERN_C_DECL const char *paragraph_key;
EXTERN_C_DECL const char *pathname_key;
EXTERN_C_DECL const char *profile_key;
EXTERN_C_DECL const char *reference_key;
diff --git a/src/pkgshow.cpp b/src/pkgshow.cpp
index 022dacf..9c5c28f 100644
--- a/src/pkgshow.cpp
+++ b/src/pkgshow.cpp
@@ -733,12 +733,6 @@ void pkgDirectoryViewer::EmitDescription( pkgXmlNode *pkg, const char *title )
*/
int offset = 0;
- /* This XML element and attribute identification key should
- * perhaps be defined in the pkgkeys.h header; once more, for
- * the time being we simply define it locally.
- */
- const char *paragraph_key = "paragraph";
-
/* The procedure is recursive, selecting description elements
* from inner levels of the XML document, progressing outward to
* the document root, then printing them in outer to inner order;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 17 +++++++++++++++++
build-aux | 1 -
src/approot.c | 5 +++--
src/pkgkeys.c | 1 +
src/pkgkeys.h | 1 +
src/pkgshow.cpp | 6 ------
6 files changed, 22 insertions(+), 9 deletions(-)
delete mode 160000 build-aux
hooks/post-receive
--
Repository: mingw-get
|