Changeset 766

Show
Ignore:
Timestamp:
03/25/08 21:05:29 (6 months ago)
Author:
dsallings
Message:

1) I don't have any prototype for daemon
2) The signature for dispatch_conn_new differs in the header and

thead.c

3) I get a "overflow" warning since the constant BIN_RES_MAGIC is

defined as a signed int...

Trond Norbye <Trond.Norbye@Sun.COM>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/binary/server/memcached.c

    r763 r766  
    6161#endif 
    6262 
     63#ifndef HAVE_DAEMON 
     64extern int daemon(int nochdir, int noclose); 
     65#endif 
     66 
    6367/* 
    6468 * forward declarations 
    …… 
    882886    res_header = (uint32_t *)c->wbuf; 
    883887 
    884     res_header[0] = BIN_RES_MAGIC << 24; 
     888    res_header[0] = ((uint32_t)BIN_RES_MAGIC) << 24; 
    885889    res_header[0] |= ((0xff & c->cmd) << 16); 
    886890    res_header[0] |= err & 0xffff; 

  • branches/binary/server/thread.c

    r745 r766  
    368368 * of an incoming connection. 
    369369 */ 
    370 void dispatch_conn_new(int sfd, int init_state, int event_flags, 
    371                        int read_buffer_size, int prot) { 
     370void dispatch_conn_new(int sfd, enum conn_states init_state, int event_flags, 
     371                       int read_buffer_size, enum protocol prot) { 
    372372    CQ_ITEM *item = cqi_new(); 
    373373    int thread = (last_thread + 1) % settings.num_threads;