CDRIVER-1919 warning in mongoc-cursor.c

ajdavis · ajdavis · commit 1e94555c5333 · 2016-11-15T14:09:04.000Z
diff --git a/src/mongoc/mongoc-cursor.c b/src/mongoc/mongoc-cursor.c
@@ -898,7 +898,9 @@ _mongoc_cursor_flags (mongoc_cursor_t        *cursor,
    *flags = MONGOC_QUERY_NONE;
 
    if (!bson_iter_init (&iter, &cursor->opts)) {
-      OPT_BSON_ERR ("Invalid 'opts' parameter.");
+      bson_set_error (&cursor->error, MONGOC_ERROR_BSON,
+                      MONGOC_ERROR_BSON_INVALID, "Invalid 'opts' parameter.");
+      return false;
    }
 
    while (bson_iter_next (&iter)) {

Original file line number	Diff line number	Diff line change
`@@ -898,7 +898,9 @@ _mongoc_cursor_flags (mongoc_cursor_t *cursor,`
`898`	`898`	`*flags = MONGOC_QUERY_NONE;`
`899`	`899`
`900`	`900`	`if (!bson_iter_init (&iter, &cursor->opts)) {`
`901`		`- OPT_BSON_ERR ("Invalid 'opts' parameter.");`
	`901`	`+ bson_set_error (&cursor->error, MONGOC_ERROR_BSON,`
	`902`	`+ MONGOC_ERROR_BSON_INVALID, "Invalid 'opts' parameter.");`
	`903`	`+ return false;`
`902`	`904`	`}`
`903`	`905`
`904`	`906`	`while (bson_iter_next (&iter)) {`