Branch: Tag:

2014-02-25

2014-02-25 14:31:54 by Per Hedbor <ph@opera.com>

The query_X_callback functions are never added as functions in the low level file

1106:    SET_ONERROR(ebuf, free_dynamic_buffer, &b);    do{    int e; -  char *buf; +     try_read=MINIMUM(CHUNK,r);      #ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
1715:   }      #undef CBFUNCS +    #define CBFUNCS(CB, EVENT) \    static void PIKE_CONCAT(file_set_,CB) (INT32 args) \    { \    if(!args) \    SIMPLE_TOO_FEW_ARGS_ERROR("Stdio.File->set_" #CB, 1); \    set_fd_event_cb (THIS, Pike_sp-args, EVENT, 0); \ -  } \ -  \ -  static void PIKE_CONCAT(file_query_,CB) (INT32 args) \ -  { \ -  pop_n_elems(args); \ -  push_svalue(& THIS->event_cbs[EVENT]); \ +     }      #define CBFUNCS2(CB, EVENT) \
1738:    SIMPLE_ARG_TYPE_ERROR("Stdio.File->set_" #CB, 2, "int"); \    set_fd_event_cb (THIS, Pike_sp-args, EVENT, \    Pike_sp[1-args].u.integer); \ -  } \ -  \ -  static void PIKE_CONCAT(file_query_,CB) (INT32 args) \ -  { \ -  pop_n_elems(args); \ -  push_svalue(& THIS->event_cbs[EVENT]); \ +     }      CBFUNCS(read_callback, PIKE_FD_READ)
2277: Inside #if defined(HAVE_PIKE_SEND_FD)
   */   static void file_send_fd(INT32 args)   { -  int e; +     int other_fd;    struct object *o = NULL;    struct my_file *f = NULL;
4600:    else if (args > 2 && TYPEOF(Pike_sp[2-args]) == PIKE_T_STRING &&    !Pike_sp[2-args].u.string->size_shift) {    PIKE_SOCKADDR addr; -  int addr_len; -  addr_len = get_inet_addr(&addr, (char *) STR0(Pike_sp[2-args].u.string), +  get_inet_addr(&addr, (char *) STR0(Pike_sp[2-args].u.string),    NULL, -1, 0);    family = SOCKADDR_FAMILY(addr);    INVALIDATE_CURRENT_TIME();