Commit b844103e authored by Greg Williams's avatar Greg Williams
Browse files

Removed deprecated .nonBlocking flag from session configuration since... 

Removed deprecated .nonBlocking flag from session configuration since connection is always configured for non-blocking and async operations are specified on each operation via presence of a closure/callback
parent 5a17f624

include/kinetic_client.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ void KineticClient_Shutdown(void); 
 * @param config    Session configuration

 *  .host             Host name or IP address to connect to

 *  .port             Port to establish socket connection on

 *  .nonBlocking      Set to true for non-blocking or false for blocking I/O

 *  .clusterVersion   Cluster version to use for the session

 *  .identity         Identity to use for the session

 *  .hmacKey          Key to use for HMAC calculations (NULL-terminated string)

src/examples/write_file_blocking.c

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ int main(int argc, char** argv) 
        .port = KINETIC_PORT,

        .clusterVersion = 0,

        .identity = 1,

        .nonBlocking = false,

        .hmacKey = ByteArray_CreateWithCString(HmacKeyString),

    };

    write_args* writeArgs = calloc(1, sizeof(write_args));

src/examples/write_file_blocking_threads.c

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ int main(int argc, char** argv) 
        .port = KINETIC_PORT,

        .clusterVersion = 0,

        .identity = 1,

        .nonBlocking = false,

        .hmacKey = ByteArray_CreateWithCString(HmacKeyString),

    };

    KineticClient_Init("stdout", 0);

src/lib/kinetic_connection.c

+1 −2
Original line number Diff line number Diff line
@@ -86,8 +86,7 @@ KineticStatus KineticConnection_Connect(KineticConnection* const connection) 
    connection->connected = false;

    connection->socket = KineticSocket_Connect(

                             connection->session.host,

                             connection->session.port,

                             connection->session.nonBlocking);

                             connection->session.port);

    connection->connected = (connection->socket >= 0);

    if (!connection->connected) {

        LOG0("Session connection failed!");

src/lib/kinetic_socket.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include <poll.h>

#include "socket99.h"



int KineticSocket_Connect(const char* host, int port, bool nonBlocking)

int KineticSocket_Connect(const char* host, int port)

{

    char port_str[32];

    struct addrinfo hints;
@@ -55,7 +55,7 @@ int KineticSocket_Connect(const char* host, int port, bool nonBlocking) 
    socket99_config cfg = {

        .host = (char*)host,

        .port = port,

        .nonblocking = nonBlocking,

        .nonblocking = true,

    };

    sprintf(port_str, "%d", port);