Merge pull request #48 from fotonauts/cast-warnings3

Avoid warning casts

Author: chergert

src/mongoc/mongoc-collection.c

@@ -1562,11 +1562,11 @@ mongoc_collection_rename (mongoc_collection_t *collection,
 
       bson_snprintf (collection->collection, sizeof collection->collection,
                      "%s", new_name);
-      collection->collectionlen = strlen (collection->collection);
+      collection->collectionlen = (int) strlen (collection->collection);
 
       bson_snprintf (collection->ns, sizeof collection->ns,
                      "%s.%s", collection->db, new_name);
-      collection->nslen = strlen (collection->ns);
+      collection->nslen = (int) strlen (collection->ns);
    }
 
    bson_destroy (&cmd);

src/mongoc/mongoc-counters-private.h

@@ -65,7 +65,7 @@ _mongoc_get_cpu_count (void)
 #elif defined(__APPLE__) || defined(__sun)
    int ncpu;
 
-   ncpu = sysconf (_SC_NPROCESSORS_ONLN);
+   ncpu = (int) sysconf (_SC_NPROCESSORS_ONLN);
    return (ncpu > 0) ? ncpu : 1;
 #elif defined(_MSC_VER) || defined(_WIN32)
    SYSTEM_INFO si;

src/mongoc/mongoc-database.c

@@ -658,7 +658,7 @@ mongoc_database_get_collection_names (mongoc_database_t *database,
    cursor = mongoc_collection_find (col, MONGOC_QUERY_NONE, 0, 0, 0, &q,
                                     NULL, NULL);
 
-   len = strlen (database->name) + 1;
+   len = (int) strlen (database->name) + 1;
 
    while (mongoc_cursor_more (cursor) &&
           !mongoc_cursor_error (cursor, error)) {

src/mongoc/mongoc-sasl.c

@@ -51,7 +51,7 @@ _mongoc_sasl_get_pass (mongoc_sasl_t  *sasl,
    }
 
    if (result_len) {
-      *result_len = sasl->pass ? strlen (sasl->pass) : 0;
+      *result_len = sasl->pass ? (unsigned) strlen (sasl->pass) : 0;
    }
 
    return (sasl->pass != NULL) ? SASL_OK : SASL_FAIL;
@@ -83,7 +83,7 @@ _mongoc_sasl_get_user (mongoc_sasl_t  *sasl,
    }
 
    if (result_len) {
-      *result_len = sasl->user ? strlen (sasl->user) : 0;
+      *result_len = sasl->user ? (unsigned) strlen (sasl->user) : 0;
    }
 
    return (sasl->user != NULL) ? SASL_OK : SASL_FAIL;

src/mongoc/mongoc-socket.c

@@ -888,7 +888,7 @@ _mongoc_socket_try_sendv (mongoc_socket_t *sock,   /* IN */
 #else
    memset (&msg, 0, sizeof msg);
    msg.msg_iov = iov;
-   msg.msg_iovlen = iovcnt;
+   msg.msg_iovlen = (int) iovcnt;
    ret = sendmsg (sock->sd, &msg,
 # ifdef MSG_NOSIGNAL
                   MSG_NOSIGNAL);

src/mongoc/mongoc-stream-file.c

@@ -133,7 +133,7 @@ _mongoc_stream_file_readv (mongoc_stream_t *stream,       /* IN */
    RETURN (ret);
 #else
    ENTRY;
-   ret = readv (file->fd, iov, iovcnt);
+   ret = readv (file->fd, iov, (int) iovcnt);
    RETURN (ret);
 #endif
 }
@@ -162,7 +162,7 @@ _mongoc_stream_file_writev (mongoc_stream_t *stream,       /* IN */
 
    return ret;
 #else
-   return writev (file->fd, iov, iovcnt);
+   return writev (file->fd, iov, (int) iovcnt);
 #endif
 }
 

src/mongoc/mongoc-uri.c

@@ -417,11 +417,11 @@ mongoc_uri_parse_option (mongoc_uri_t *uri,
        !strcasecmp(key, "waitqueuemultiple") ||
        !strcasecmp(key, "waitqueuetimeoutms") ||
        !strcasecmp(key, "wtimeoutms")) {
-      v_int = strtol(value, NULL, 10);
+      v_int = (int) strtol (value, NULL, 10);
       bson_append_int32(&uri->options, key, -1, v_int);
    } else if (!strcasecmp(key, "w")) {
       if (*value == '-' || isdigit(*value)) {
-         v_int = strtol (value, NULL, 10);
+         v_int = (int) strtol (value, NULL, 10);
          BSON_APPEND_INT32 (&uri->options, "w", v_int);
       } else if (0 == strcasecmp (value, "majority")) {
          BSON_APPEND_UTF8 (&uri->options, "w", "majority");