CDRIVER-990 rename wire version constants

Author: ajdavis

src/mongoc/mongoc-client-private.h

@@ -42,21 +42,21 @@
 BSON_BEGIN_DECLS
 
 /* protocol versions this driver can speak */
-#define MIN_WIRE_VERSION 0
-#define MAX_WIRE_VERSION 4
+#define WIRE_VERSION_MIN 0
+#define WIRE_VERSION_MAX 4
 
 /* first version that supported aggregation cursors */
-#define AGGREGATION_CURSOR_WIRE_VERSION 1
+#define WIRE_VERSION_AGG_CURSOR 1
 /* first version that supported "insert", "update", "delete" commands */
-#define WRITE_COMMAND_WIRE_VERSION 2
+#define WIRE_VERSION_WRITE_CMD 2
 /* first version when SCRAM-SHA-1 replaced MONGODB-CR as default auth mech */
-#define SCRAM_DEFAULT_AUTH_WIRE_VERSION 3
+#define WIRE_VERSION_SCRAM_DEFAULT 3
 /* first version that supported "find" and "getMore" commands */
-#define FIND_COMMAND_WIRE_VERSION 4
+#define WIRE_VERSION_FIND_CMD 4
 /* first version with "killCursors" command */
-#define KILLCURSORS_COMMAND_WIRE_VERSION 4
+#define WIRE_VERSION_KILLCURSORS_CMD 4
 /* first version when findAndModify accepts writeConcern */
-#define FAM_WRITE_CONCERN_WIRE_VERSION 4
+#define WIRE_VERSION_FAM_WRITE_CONCERN 4
 
 
 struct _mongoc_client_t

src/mongoc/mongoc-client.c

@@ -1210,7 +1210,7 @@ _mongoc_client_kill_cursor (mongoc_client_t *client,
 
    if (db && collection &&
        server_stream->sd->max_wire_version >=
-       KILLCURSORS_COMMAND_WIRE_VERSION) {
+       WIRE_VERSION_KILLCURSORS_CMD) {
       _mongoc_client_killcursors_command (&client->cluster, server_stream,
                                           cursor_id, db, collection);
    } else {

src/mongoc/mongoc-cluster.c

@@ -1091,7 +1091,7 @@ _mongoc_cluster_auth_node (mongoc_cluster_t *cluster,
 
    /* Use cached max_wire_version, not value from sd */
    if (!mechanism) {
-      if (max_wire_version < SCRAM_DEFAULT_AUTH_WIRE_VERSION) {
+      if (max_wire_version < WIRE_VERSION_SCRAM_DEFAULT) {
          mechanism = "MONGODB-CR";
       } else {
          mechanism = "SCRAM-SHA-1";

src/mongoc/mongoc-collection.c

@@ -320,7 +320,7 @@ mongoc_collection_aggregate (mongoc_collection_t       *collection, /* IN */
 
    cursor->hint = selected_server->id;
    use_cursor = 
-      selected_server->max_wire_version >= AGGREGATION_CURSOR_WIRE_VERSION;
+      selected_server->max_wire_version >= WIRE_VERSION_AGG_CURSOR;
 
    BSON_APPEND_UTF8 (&command, "aggregate", collection->collection);
 
@@ -1996,7 +1996,7 @@ mongoc_collection_find_and_modify_with_opts (mongoc_collection_t
 
    wc = opts->write_concern ? opts->write_concern : collection->write_concern;
 
-   if (server_stream->sd->max_wire_version >= FAM_WRITE_CONCERN_WIRE_VERSION) {
+   if (server_stream->sd->max_wire_version >= WIRE_VERSION_FAM_WRITE_CONCERN) {
       if (!_mongoc_write_concern_is_valid (wc)) {
          bson_set_error (error,
                          MONGOC_ERROR_COMMAND,

src/mongoc/mongoc-cursor.c

@@ -321,7 +321,7 @@ _use_find_command (const mongoc_cursor_t *cursor,
     * used to execute other commands" and "the find command does not support the
     * exhaust flag."
     */
-   return server_stream->sd->max_wire_version >= FIND_COMMAND_WIRE_VERSION &&
+   return server_stream->sd->max_wire_version >= WIRE_VERSION_FIND_CMD &&
           !cursor->is_command &&
           !(cursor->flags & MONGOC_QUERY_EXHAUST);
 }

src/mongoc/mongoc-write-command.c

@@ -956,7 +956,7 @@ _mongoc_write_command_execute (mongoc_write_command_t       *command,       /* I
       BSON_ASSERT (command->hint == server_stream->sd->id);
    }
 
-   if (server_stream->sd->max_wire_version >= WRITE_COMMAND_WIRE_VERSION) {
+   if (server_stream->sd->max_wire_version >= WIRE_VERSION_WRITE_CMD) {
       _mongoc_write_command (command, client, server_stream, database,
                              collection, write_concern, offset,
                              result, &result->error);