Changeset 752

Show
Ignore:
Timestamp:
03/17/08 07:40:41 (21 months ago)
Author:
dsallings
Message:

Handle protocol enums more correctly.

Location:
branches/binary/server
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/binary/server/memcached.c

    r746 r752  
    6666static void drive_machine(conn *c); 
    6767static int new_socket(struct addrinfo *ai); 
    68 static int server_socket(const int port, const int prot); 
     68static int server_socket(const int port, enum protocol prot); 
    6969static int try_read_command(conn *c); 
    7070static int try_read_network(conn *c); 
    … …  
    315315 
    316316conn *conn_new(const int sfd, const int init_state, const int event_flags, 
    317                 const int read_buffer_size, const int prot, 
     317                const int read_buffer_size, enum protocol prot, 
    318318                struct event_base *base) { 
    319319    conn *c = conn_from_freelist(); 
    … …  
    30433043} 
    30443044 
    3045 static int server_socket(const int port, const int prot) { 
     3045static int server_socket(const int port, enum protocol prot) { 
    30463046    int sfd; 
    30473047    struct linger ling = {0, 0}; 

  • branches/binary/server/memcached.h

    r745 r752  
    198198}; 
    199199 
    200 enum protocols { 
     200enum protocol { 
    201201    ascii_prot = 3, /* arbitrary value. */ 
    202202    ascii_udp_prot, 
    … …  
    273273    int    suffixleft; 
    274274 
    275     int protocol;   /* which protocol this connection speaks */ 
     275    enum protocol protocol;   /* which protocol this connection speaks */ 
    276276 
    277277    /* data for UDP clients */ 
    … …  
    315315char *do_add_delta(item *item, const bool incr, const int64_t delta, char *buf); 
    316316int do_store_item(item *item, int comm); 
    317 conn *conn_new(const int sfd, const int init_state, const int event_flags, const int read_buffer_size, const int prot, struct event_base *base); 
     317conn *conn_new(const int sfd, const int init_state, const int event_flags, const int read_buffer_size, enum protocol prot, struct event_base *base); 
    318318 
    319319 
    … …  
    341341void thread_init(int nthreads, struct event_base *main_base); 
    342342int  dispatch_event_add(int thread, conn *c); 
    343 void dispatch_conn_new(int sfd, int init_state, int event_flags, int read_buffer_size, int prot); 
     343void dispatch_conn_new(int sfd, int init_state, int event_flags, int read_buffer_size, enum protocol prot); 
    344344 
    345345/* Lock wrappers for cache functions that are called from main loop. */