[138941] trunk/base/src/pextlib1.0

24 Jul 2015

Revision: 138941
          https://trac.macports.org/changeset/138941
Author:   raimue@macports.org
Date:     2015-07-24 08:24:40 -0700 (Fri, 24 Jul 2015)
Log Message:
-----------
pextlib: Use new ui_* functions with printf style

Modified Paths:
--------------
    trunk/base/src/pextlib1.0/system.c
    trunk/base/src/pextlib1.0/xinstall.c

Modified: trunk/base/src/pextlib1.0/system.c
===================================================================

--- 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)
@@ -288,10 +288,7 @@
                     pos = 0;
                 }
 
-                if (ui_info(interp, sbuf) != TCL_OK) {
-                    read_failed = 1;
-                    break;
-                }
+                ui_info(interp, "%s", sbuf);
             }
             fclose(pdes);
         } else {
@@ -307,21 +304,11 @@
         if (WEXITSTATUS(ret) == 0) {
             status = TCL_OK;
         } else {
-            char *errorstr;
-            size_t errorstrlen;
             Tcl_Obj* errorCode;
 
             /* print error */
-            /* 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);
-            }
+            ui_info(interp, "Command failed: %s", cmdstring);
+            ui_info(interp, "Exit code: %d", WEXITSTATUS(ret));
 
             /* set errorCode [list CHILDSTATUS <pid> <code>] */
             errorCode = Tcl_NewListObj(0, NULL);

Modified: trunk/base/src/pextlib1.0/xinstall.c
===================================================================
--- 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)
@@ -310,10 +310,7 @@
 			return TCL_ERROR;
 		}
 		else {
-			char msg[255];
-
-			snprintf(msg, sizeof msg, "%s: chdir(%s)\n", funcname, curdir);
-			ui_info(interp, msg);
+                        ui_info(interp, "%s: chdir(%s)\n", funcname, curdir);
 		}
 	}
 
@@ -443,9 +440,6 @@
 	int tempcopy, temp_fd, to_fd = 0;
 	char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN];
 
-        /* message contains function name, two paths and a little bit extra formatting */
-        char msg[MAXPATHLEN * 2 + 32];
-
 	files_match = 0;
 
 	/* If try to install NULL file to a directory, fails. */
@@ -547,8 +541,7 @@
 				Tcl_SetResult(interp, errmsg, TCL_VOLATILE);
 				return TCL_ERROR;
 			}
-			snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, from_name, to_name);
-			ui_info(interp, msg);
+			ui_info(interp, "%s: %s -> %s\n", funcname, from_name, to_name);
 		}
 		if (!devnull) {
 			if (copy(interp, from_fd, from_name, to_fd,
@@ -650,8 +643,7 @@
 				Tcl_SetResult(interp, errmsg, TCL_VOLATILE);
 				return TCL_ERROR;
 			}
-			snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, to_name, backup);
-			ui_info(interp, msg);
+                        ui_info(interp, "%s: %s -> %s\n", funcname, to_name, backup);
 			if (rename(to_name, backup) < 0) {
 				char errmsg[255];
 
@@ -664,8 +656,7 @@
 				return TCL_ERROR;
 			}
 		}
-		snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, from_name, to_name);
-		ui_info(interp, msg);
+                ui_info(interp, "%s: %s -> %s\n", funcname, from_name, to_name);
 		if (rename(tempfile, to_name) < 0) {
 			char errmsg[255];
 
@@ -885,7 +876,6 @@
 	char backup[MAXPATHLEN];
 	int saved_errno = 0;
 	int newfd;
-	char msg[256];
 
 	if (target) {
 		/*
@@ -909,8 +899,7 @@
 				return -1;
 			}
 			(void)snprintf(backup, MAXPATHLEN, "%s%s", path, suffix);
-			snprintf(msg, sizeof msg, "%s: %s -> %s\n", funcname, path, backup);
-			ui_info(interp, msg);
+                        ui_info(interp, "%s: %s -> %s\n", funcname, path, backup);
 			if (rename(path, backup) < 0) {
 				char errmsg[255];
 
@@ -1068,10 +1057,7 @@
 					return TCL_ERROR;
 				}
 				else {
-					char msg[255];
-
-					snprintf(msg, sizeof msg, "%s: mkdir %s\n", funcname, path);
-					ui_info(interp, msg);
+                                        ui_info(interp, "%s: mkdir %s\n", funcname, path);
 				}
 			} else if (!S_ISDIR(sb.st_mode)) {
 				char errmsg[255];

    

raimue＠macports.org

tags

participants (1)