<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120072] branches/release_2_3/base</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120072">120072</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-05-14 15:29:40 -0700 (Wed, 14 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="https://trac.macports.org/changeset/120064">r120064</a>, <a href="https://trac.macports.org/changeset/120067">r120067</a>, <a href="https://trac.macports.org/changeset/120068">r120068</a>, <a href="https://trac.macports.org/changeset/120069">r120069</a> from trunk:
<a href="https://trac.macports.org/changeset/120064">r120064</a>: base: cregistry: Fix warnings on Linux, stick to a standard, avoid undefined behavior
<a href="https://trac.macports.org/changeset/120067">r120067</a>: base: machista1.0: Fix warnings on Linux, define feature test macros
<a href="https://trac.macports.org/changeset/120068">r120068</a>: base: macports1.0: Fix warnings on Linux
<a href="https://trac.macports.org/changeset/120069">r120069</a>: base: registry2.0: Fix warnings on Linux, define a standards version for the feature test macros</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesrelease_2_3basesrccregistryMakefilein">branches/release_2_3/base/src/cregistry/Makefile.in</a></li>
<li><a href="#branchesrelease_2_3basesrccregistryregistryc">branches/release_2_3/base/src/cregistry/registry.c</a></li>
<li><a href="#branchesrelease_2_3basesrccregistryregistryh">branches/release_2_3/base/src/cregistry/registry.h</a></li>
<li><a href="#branchesrelease_2_3basesrcmachista10libmachistac">branches/release_2_3/base/src/machista1.0/libmachista.c</a></li>
<li><a href="#branchesrelease_2_3basesrcmacports10get_systemconfiguration_proxiesc">branches/release_2_3/base/src/macports1.0/get_systemconfiguration_proxies.c</a></li>
<li><a href="#branchesrelease_2_3basesrcmacports10sysctlc">branches/release_2_3/base/src/macports1.0/sysctl.c</a></li>
<li><a href="#branchesrelease_2_3basesrcregistry20Makefilein">branches/release_2_3/base/src/registry2.0/Makefile.in</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchesrelease_2_3base">branches/release_2_3/base/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesrelease_2_3base"></a>
<div class="propset"><h4>Property changes: branches/release_2_3/base</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/gsoc09-logging/base:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base:78828-88375
</span><span class="cx">/branches/gsoc11-statistics/base:79520,79666
</span><span class="cx">/branches/gsoc13-tests:106692-111324
</span><span class="cx">/branches/universal-sanity/base:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><span class="cx"> + /branches/gsoc08-privileges/base:37343-46937
</span><span class="cx">/branches/gsoc09-logging/base:51231-60371
</span><span class="cx">/branches/gsoc11-rev-upgrade/base:78828-88375
</span><span class="cx">/branches/gsoc11-statistics/base:79520,79666
</span><span class="cx">/branches/gsoc13-tests:106692-111324
</span><span class="cx">/branches/universal-sanity/base:51872-52323
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:118038-118039,118056,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059,120064,120067-120069
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><a id="branchesrelease_2_3basesrccregistryMakefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/cregistry/Makefile.in (120071 => 120072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/cregistry/Makefile.in 2014-05-14 22:28:52 UTC (rev 120071)
+++ branches/release_2_3/base/src/cregistry/Makefile.in 2014-05-14 22:29:40 UTC (rev 120072)
</span><span class="lines">@@ -12,6 +12,9 @@
</span><span class="cx">
</span><span class="cx"> include ../../Mk/macports.autoconf.mk
</span><span class="cx">
</span><ins>+# required for strdup(3) on Linux and OS X
+CPPFLAGS+=-D_XOPEN_SOURCE=600
+
</ins><span class="cx"> all:: ${STLIB_NAME} ${SQLEXT_NAME}
</span><span class="cx">
</span><span class="cx"> .c.o:
</span></span></pre></div>
<a id="branchesrelease_2_3basesrccregistryregistryc"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/cregistry/registry.c (120071 => 120072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/cregistry/registry.c 2014-05-14 22:28:52 UTC (rev 120071)
+++ branches/release_2_3/base/src/cregistry/registry.c 2014-05-14 22:29:40 UTC (rev 120072)
</span><span class="lines">@@ -54,6 +54,21 @@
</span><span class="cx"> * alive at any given time.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/*
+ * Error constants. Those need to be constants and cannot be string literals
+ * because we'll use address comparisons for those and compilers don't have to
+ * guarantee string literals always have the same address (they don't have to
+ * guarantee string literals will have an address at all, so comparing the
+ * address of a string with a string literal is undefined behavior).
+ */
+char *const registry_err_not_found = "registry::not-found";
+char *const registry_err_invalid = "registry::invalid";
+char *const registry_err_constraint = "registry::constraint";
+char *const registry_err_sqlite_error = "registry::sqlite-error";
+char *const registry_err_misuse = "registry::misuse";
+char *const registry_err_cannot_init = "registry::cannot-init";
+char *const registry_err_already_active = "registry::already-active";
+
</ins><span class="cx"> /**
</span><span class="cx"> * Destroys a `reg_error` object. This should be called on any reg_error when a
</span><span class="cx"> * registry function returns a failure condition; depending on the function,
</span></span></pre></div>
<a id="branchesrelease_2_3basesrccregistryregistryh"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/cregistry/registry.h (120071 => 120072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/cregistry/registry.h 2014-05-14 22:28:52 UTC (rev 120071)
+++ branches/release_2_3/base/src/cregistry/registry.h 2014-05-14 22:29:40 UTC (rev 120072)
</span><span class="lines">@@ -37,14 +37,22 @@
</span><span class="cx"> #include <sqlite3.h>
</span><span class="cx"> #include <tcl.h>
</span><span class="cx">
</span><del>-#define REG_NOT_FOUND "registry::not-found"
-#define REG_INVALID "registry::invalid"
-#define REG_CONSTRAINT "registry::constraint"
-#define REG_SQLITE_ERROR "registry::sqlite-error"
-#define REG_MISUSE "registry::misuse"
-#define REG_CANNOT_INIT "registry::cannot-init"
-#define REG_ALREADY_ACTIVE "registry::already-active"
</del><ins>+#define REG_NOT_FOUND (registry_err_not_found)
+#define REG_INVALID (registry_err_invalid)
+#define REG_CONSTRAINT (registry_err_constraint)
+#define REG_SQLITE_ERROR (registry_err_sqlite_error)
+#define REG_MISUSE (registry_err_misuse)
+#define REG_CANNOT_INIT (registry_err_cannot_init)
+#define REG_ALREADY_ACTIVE (registry_err_already_active)
</ins><span class="cx">
</span><ins>+extern char *const registry_err_not_found;
+extern char *const registry_err_invalid;
+extern char *const registry_err_constraint;
+extern char *const registry_err_sqlite_error;
+extern char *const registry_err_misuse;
+extern char *const registry_err_cannot_init;
+extern char *const registry_err_already_active;
+
</ins><span class="cx"> typedef void reg_error_destructor(const char* description);
</span><span class="cx">
</span><span class="cx"> typedef struct {
</span></span></pre></div>
<a id="branchesrelease_2_3basesrcmachista10libmachistac"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/machista1.0/libmachista.c (120071 => 120072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/machista1.0/libmachista.c 2014-05-14 22:28:52 UTC (rev 120071)
+++ branches/release_2_3/base/src/machista1.0/libmachista.c 2014-05-14 22:29:40 UTC (rev 120072)
</span><span class="lines">@@ -30,8 +30,15 @@
</span><span class="cx"> * POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#ifdef HAVE_CONFIG_H
</ins><span class="cx"> #include <config.h>
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+/* required for asprintf(3) on OS X */
+#define _DARWIN_C_SOURCE
+/* required for asprintf(3) on Linux */
+#define _GNU_SOURCE
+
</ins><span class="cx"> #include <stdbool.h>
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <stdlib.h>
</span><span class="lines">@@ -109,14 +116,15 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#ifdef __MACH__
</ins><span class="cx"> const char *macho_get_arch_name (cpu_type_t cputype) {
</span><del>-#ifdef __MACH__
</del><span class="cx"> const NXArchInfo *archInfo = NXGetArchInfoFromCpuType(cputype, CPU_SUBTYPE_MULTIPLE);
</span><span class="cx"> if (!archInfo) {
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx"> return archInfo->name;
</span><span class="cx"> #else
</span><ins>+const char *macho_get_arch_name (cpu_type_t cputype UNUSED) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -239,8 +247,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* Parse a Mach-O header */
</span><ins>+#ifdef __MACH__
</ins><span class="cx"> static int parse_macho (macho_t *mt, macho_input_t *input) {
</span><del>-#ifdef __MACH__
</del><span class="cx"> /* Read the file type. */
</span><span class="cx"> const uint32_t *magic = macho_read(input, input->data, sizeof(uint32_t));
</span><span class="cx"> if (magic == NULL)
</span><span class="lines">@@ -437,14 +445,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return MACHO_SUCCESS;
</span><del>-#else
- return 0;
</del><ins>+}
</ins><span class="cx"> #endif
</span><del>-}
</del><span class="cx">
</span><span class="cx"> /* Parse a (possible Mach-O) file. For a more detailed description, see the header */
</span><ins>+#ifdef __MACH__
</ins><span class="cx"> int macho_parse_file(macho_handle_t *handle, const char *filepath, const macho_t **res) {
</span><del>-#ifdef __MACH__
</del><span class="cx"> int fd;
</span><span class="cx"> struct stat st;
</span><span class="cx"> void *data;
</span><span class="lines">@@ -505,6 +511,7 @@
</span><span class="cx">
</span><span class="cx"> return ret;
</span><span class="cx"> #else
</span><ins>+int macho_parse_file(macho_handle_t *handle UNUSED, const char *filepath UNUSED, const macho_t **res UNUSED) {
</ins><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesrelease_2_3basesrcmacports10get_systemconfiguration_proxiesc"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/macports1.0/get_systemconfiguration_proxies.c (120071 => 120072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/macports1.0/get_systemconfiguration_proxies.c 2014-05-14 22:28:52 UTC (rev 120071)
+++ branches/release_2_3/base/src/macports1.0/get_systemconfiguration_proxies.c 2014-05-14 22:29:40 UTC (rev 120072)
</span><span class="lines">@@ -55,7 +55,11 @@
</span><span class="cx"> *
</span><span class="cx"> * Synopsis: array set someArray get_systemconfiguration_proxies
</span><span class="cx"> */
</span><ins>+#ifdef HAVE_FRAMEWORK_SYSTEMCONFIGURATION
</ins><span class="cx"> int GetSystemConfigurationProxiesCmd( ClientData clientData UNUSED, Tcl_Interp *interp, int objc UNUSED, Tcl_Obj *CONST objv[] UNUSED )
</span><ins>+#else
+int GetSystemConfigurationProxiesCmd( ClientData clientData UNUSED, Tcl_Interp *interp UNUSED, int objc UNUSED, Tcl_Obj *CONST objv[] UNUSED )
+#endif
</ins><span class="cx"> {
</span><span class="cx"> int cmdResult = TCL_OK;
</span><span class="cx"> #ifdef HAVE_FRAMEWORK_SYSTEMCONFIGURATION
</span></span></pre></div>
<a id="branchesrelease_2_3basesrcmacports10sysctlc"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/macports1.0/sysctl.c (120071 => 120072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/macports1.0/sysctl.c 2014-05-14 22:28:52 UTC (rev 120071)
+++ branches/release_2_3/base/src/macports1.0/sysctl.c 2014-05-14 22:29:40 UTC (rev 120072)
</span><span class="lines">@@ -49,9 +49,13 @@
</span><span class="cx"> /*
</span><span class="cx"> * Read-only wrapper for sysctlbyname(3). Only works for values of type CTLTYPE_INT and CTLTYPE_QUAD.
</span><span class="cx"> */
</span><ins>+#ifdef HAVE_SYSCTLBYNAME
</ins><span class="cx"> int SysctlCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
</span><ins>+#else
+int SysctlCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc UNUSED, Tcl_Obj *CONST objv[] UNUSED)
+#endif
</ins><span class="cx"> {
</span><del>-#if HAVE_SYSCTLBYNAME
</del><ins>+#ifdef HAVE_SYSCTLBYNAME
</ins><span class="cx"> const char error_message[] = "sysctl failed: ";
</span><span class="cx"> Tcl_Obj *tcl_result;
</span><span class="cx"> int res;
</span></span></pre></div>
<a id="branchesrelease_2_3basesrcregistry20Makefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/registry2.0/Makefile.in (120071 => 120072)</h4>
<pre class="diff"><span>
<span class="info">--- branches/release_2_3/base/src/registry2.0/Makefile.in 2014-05-14 22:28:52 UTC (rev 120071)
+++ branches/release_2_3/base/src/registry2.0/Makefile.in 2014-05-14 22:29:40 UTC (rev 120072)
</span><span class="lines">@@ -18,6 +18,8 @@
</span><span class="cx">
</span><span class="cx"> include $(srcdir)/../../Mk/macports.tea.mk
</span><span class="cx">
</span><ins>+CPPFLAGS+=-D_XOPEN_SOURCE=600
+
</ins><span class="cx"> pkgIndex.tcl: $(SRCS) $(SRCS_AUTOCONF)
</span><span class="cx">
</span><span class="cx"> CFLAGS+= ${SQLITE3_CFLAGS}
</span></span></pre>
</div>
</div>
</body>
</html>