<!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>[138941] trunk/base/src/pextlib1.0</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/138941">138941</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2015-07-24 08:24:40 -0700 (Fri, 24 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>pextlib: Use new ui_* functions with printf style</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcpextlib10systemc">trunk/base/src/pextlib1.0/system.c</a></li>
<li><a href="#trunkbasesrcpextlib10xinstallc">trunk/base/src/pextlib1.0/xinstall.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcpextlib10systemc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/pextlib1.0/system.c (138940 => 138941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/pextlib1.0/system.c 2015-07-24 11:06:48 UTC (rev 138940)
+++ trunk/base/src/pextlib1.0/system.c 2015-07-24 15:24:40 UTC (rev 138941)
</span><span class="lines">@@ -288,10 +288,7 @@
</span><span class="cx"> pos = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (ui_info(interp, sbuf) != TCL_OK) {
- read_failed = 1;
- break;
- }
</del><ins>+ ui_info(interp, "%s", sbuf);
</ins><span class="cx"> }
</span><span class="cx"> fclose(pdes);
</span><span class="cx"> } else {
</span><span class="lines">@@ -307,21 +304,11 @@
</span><span class="cx"> if (WEXITSTATUS(ret) == 0) {
</span><span class="cx"> status = TCL_OK;
</span><span class="cx"> } else {
</span><del>- char *errorstr;
- size_t errorstrlen;
</del><span class="cx"> Tcl_Obj* errorCode;
</span><span class="cx">
</span><span class="cx"> /* print error */
</span><del>- /* get buffer large enough for additional message or the error code */
- errorstrlen = strlen(cmdstring) + strlen("Command failed: ") + 12;
- errorstr = malloc(errorstrlen);
- if (errorstr) {
- snprintf(errorstr, errorstrlen, "Command failed: %s", cmdstring);
- ui_info(interp, errorstr);
- snprintf(errorstr, errorstrlen, "Exit code: %d", WEXITSTATUS(ret));
- ui_info(interp, errorstr);
- free(errorstr);
- }
</del><ins>+ ui_info(interp, "Command failed: %s", cmdstring);
+ ui_info(interp, "Exit code: %d", WEXITSTATUS(ret));
</ins><span class="cx">
</span><span class="cx"> /* set errorCode [list CHILDSTATUS <pid> <code>] */
</span><span class="cx"> errorCode = Tcl_NewListObj(0, NULL);
</span></span></pre></div>
<a id="trunkbasesrcpextlib10xinstallc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/pextlib1.0/xinstall.c (138940 => 138941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/pextlib1.0/xinstall.c 2015-07-24 11:06:48 UTC (rev 138940)
+++ trunk/base/src/pextlib1.0/xinstall.c 2015-07-24 15:24:40 UTC (rev 138941)
</span><span class="lines">@@ -310,10 +310,7 @@
</span><span class="cx"> return TCL_ERROR;
</span><span class="cx"> }
</span><span class="cx"> else {
</span><del>- char msg[255];
-
- snprintf(msg, sizeof msg, "%s: chdir(%s)\n", funcname, curdir);
- ui_info(interp, msg);
</del><ins>+ ui_info(interp, "%s: chdir(%s)\n", funcname, curdir);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -443,9 +440,6 @@
</span><span class="cx"> int tempcopy, temp_fd, to_fd = 0;
</span><span class="cx"> char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN];
</span><span class="cx">
</span><del>- /* message contains function name, two paths and a little bit extra formatting */
- char msg[MAXPATHLEN * 2 + 32];
-
</del><span class="cx"> files_match = 0;
</span><span class="cx">
</span><span class="cx"> /* If try to install NULL file to a directory, fails. */
</span><span class="lines">@@ -547,8 +541,7 @@
</span><span class="cx"> Tcl_SetResult(interp, errmsg, TCL_VOLATILE);
</span><span class="cx"> return TCL_ERROR;
</span><span class="cx"> }
</span><del>- snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, from_name, to_name);
- ui_info(interp, msg);
</del><ins>+ ui_info(interp, "%s: %s -> %s\n", funcname, from_name, to_name);
</ins><span class="cx"> }
</span><span class="cx"> if (!devnull) {
</span><span class="cx"> if (copy(interp, from_fd, from_name, to_fd,
</span><span class="lines">@@ -650,8 +643,7 @@
</span><span class="cx"> Tcl_SetResult(interp, errmsg, TCL_VOLATILE);
</span><span class="cx"> return TCL_ERROR;
</span><span class="cx"> }
</span><del>- snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, to_name, backup);
- ui_info(interp, msg);
</del><ins>+ ui_info(interp, "%s: %s -> %s\n", funcname, to_name, backup);
</ins><span class="cx"> if (rename(to_name, backup) < 0) {
</span><span class="cx"> char errmsg[255];
</span><span class="cx">
</span><span class="lines">@@ -664,8 +656,7 @@
</span><span class="cx"> return TCL_ERROR;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, from_name, to_name);
- ui_info(interp, msg);
</del><ins>+ ui_info(interp, "%s: %s -> %s\n", funcname, from_name, to_name);
</ins><span class="cx"> if (rename(tempfile, to_name) < 0) {
</span><span class="cx"> char errmsg[255];
</span><span class="cx">
</span><span class="lines">@@ -885,7 +876,6 @@
</span><span class="cx"> char backup[MAXPATHLEN];
</span><span class="cx"> int saved_errno = 0;
</span><span class="cx"> int newfd;
</span><del>- char msg[256];
</del><span class="cx">
</span><span class="cx"> if (target) {
</span><span class="cx"> /*
</span><span class="lines">@@ -909,8 +899,7 @@
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx"> (void)snprintf(backup, MAXPATHLEN, "%s%s", path, suffix);
</span><del>- snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, path, backup);
- ui_info(interp, msg);
</del><ins>+ ui_info(interp, "%s: %s -> %s\n", funcname, path, backup);
</ins><span class="cx"> if (rename(path, backup) < 0) {
</span><span class="cx"> char errmsg[255];
</span><span class="cx">
</span><span class="lines">@@ -1068,10 +1057,7 @@
</span><span class="cx"> return TCL_ERROR;
</span><span class="cx"> }
</span><span class="cx"> else {
</span><del>- char msg[255];
-
- snprintf(msg, sizeof msg, "%s: mkdir %s\n", funcname, path);
- ui_info(interp, msg);
</del><ins>+ ui_info(interp, "%s: mkdir %s\n", funcname, path);
</ins><span class="cx"> }
</span><span class="cx"> } else if (!S_ISDIR(sb.st_mode)) {
</span><span class="cx"> char errmsg[255];
</span></span></pre>
</div>
</div>
</body>
</html>