[113342] trunk/base/src

[toby at macports.org]

Revision: 113342
          https://trac.macports.org/changeset/113342
Author:   toby at macports.org
Date:     2013-11-13 12:51:15 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
fix conversion warnings

Modified Paths:
--------------
    trunk/base/src/cregistry/vercomp.c
    trunk/base/src/macports1.0/get_systemconfiguration_proxies.c
    trunk/base/src/pextlib1.0/Pextlib.c
    trunk/base/src/registry2.0/util.c

Modified: trunk/base/src/cregistry/vercomp.c
===================================================================
--- trunk/base/src/cregistry/vercomp.c	2013-11-13 20:44:24 UTC (rev 113341)
+++ trunk/base/src/cregistry/vercomp.c	2013-11-13 20:51:15 UTC (rev 113342)
@@ -65,12 +65,12 @@
 	const char *eptrA, *eptrB;
 
     if (lengthA < 0)
-        lengthA = strlen(versionA);
+        lengthA = (int)strlen(versionA);
     if (lengthB < 0)
-        lengthB = strlen(versionB);
+        lengthB = (int)strlen(versionB);
 
 	/* if versions equal, return zero */
-	if(lengthA == lengthB && !strncmp(versionA, versionB, lengthA))
+	if(lengthA == lengthB && !strncmp(versionA, versionB, (size_t)lengthA))
 		return 0;
 
 	ptrA = versionA;

Modified: trunk/base/src/macports1.0/get_systemconfiguration_proxies.c
===================================================================
--- trunk/base/src/macports1.0/get_systemconfiguration_proxies.c	2013-11-13 20:44:24 UTC (rev 113341)
+++ trunk/base/src/macports1.0/get_systemconfiguration_proxies.c	2013-11-13 20:51:15 UTC (rev 113342)
@@ -132,7 +132,7 @@
                  * We are adding :<port>\0 to the end, which is up to 7
                  * bytes additional (up to 5 for the port)
                  */
-                int newLength = strlen( hostname ) + 7;
+                size_t newLength = strlen( hostname ) + 7;
                 char *hostnameAndPort = calloc( 1, newLength );
                 if( hostnameAndPort != NULL )
                 {
@@ -165,8 +165,8 @@
  */
 char *cfStringToCStringASCII( CFStringRef cfString )
 {
-    int strLen = CFStringGetMaximumSizeForEncoding( CFStringGetLength( cfString ), kCFStringEncodingASCII ) + 1;
-    char *cString = calloc( 1, strLen );
+    CFIndex strLen = CFStringGetMaximumSizeForEncoding( CFStringGetLength( cfString ), kCFStringEncodingASCII ) + 1;
+    char *cString = calloc( 1, (size_t)strLen );
     if( cString != NULL )
         CFStringGetCString( cfString, cString, strLen, kCFStringEncodingASCII );
 

Modified: trunk/base/src/pextlib1.0/Pextlib.c
===================================================================
--- trunk/base/src/pextlib1.0/Pextlib.c	2013-11-13 20:44:24 UTC (rev 113341)
+++ trunk/base/src/pextlib1.0/Pextlib.c	2013-11-13 20:51:15 UTC (rev 113342)
@@ -203,7 +203,7 @@
 
     user = strdup(Tcl_GetString(objv[1]));
     if (isdigit(*(user)))
-        pwent = getpwuid(strtol(user, 0, 0));
+        pwent = getpwuid((uid_t)strtol(user, 0, 0));
     else
         pwent = getpwnam(user);
     free(user);
@@ -230,7 +230,7 @@
 
     group = strdup(Tcl_GetString(objv[1]));
     if (isdigit(*(group)))
-        grent = getgrgid(strtol(group, 0, 0));
+        grent = getgrgid((gid_t)strtol(group, 0, 0));
     else
         grent = getgrnam(group);
     free(group);
@@ -254,7 +254,7 @@
 
     cur = MIN_USABLE_UID;
 
-    while (getpwuid(cur) != NULL) {
+    while (getpwuid((uid_t)cur) != NULL) {
         cur++;
     }
 
@@ -271,7 +271,7 @@
 
     cur = MIN_USABLE_GID;
 
-    while (getgrgid(cur) != NULL) {
+    while (getgrgid((gid_t)cur) != NULL) {
         cur++;
     }
 
@@ -392,7 +392,7 @@
         for (envp = environ; *envp != NULL; envp++) {
             equals = strchr(*envp, '=');
             if (equals != NULL) {
-                len = equals - *envp;
+                len = (size_t)(equals - *envp);
                 Tcl_ListObjAppendElement(interp, tclList, Tcl_NewStringObj(*envp, len));
             }
         }

Modified: trunk/base/src/registry2.0/util.c
===================================================================
--- trunk/base/src/registry2.0/util.c	2013-11-13 20:44:24 UTC (rev 113341)
+++ trunk/base/src/registry2.0/util.c	2013-11-13 20:51:15 UTC (rev 113342)
@@ -49,7 +49,7 @@
  * objects of a similar nature.
  */
 char* unique_name(Tcl_Interp* interp, char* prefix, int* lower_bound) {
-    int result_size = strlen(prefix) + TCL_INTEGER_SPACE + 1;
+    size_t result_size = strlen(prefix) + TCL_INTEGER_SPACE + 1;
     char* result = malloc(result_size);
     Tcl_CmdInfo info;
     int i;
@@ -243,7 +243,7 @@
 int recast(void* userdata, cast_function* fn, void* castcalldata,
         free_function* del, void*** outv, void** inv, int inc,
         reg_error* errPtr) {
-    void** result = malloc(inc*sizeof(void*));
+    void** result = malloc((size_t)inc*sizeof(void*));
     int i;
     if (!result) {
         return 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/ab0b11da/attachment.html>