[BACK]Return to tmux.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/tmux.h between version 1.475 and 1.476

version 1.475, 2014/10/20 23:35:28 version 1.476, 2014/10/20 23:57:14
Line 69 
Line 69 
 #define unused __attribute__ ((unused))  #define unused __attribute__ ((unused))
   
 /* Attribute to make gcc check printf-like arguments. */  /* Attribute to make gcc check printf-like arguments. */
 #define printflike1 __attribute__ ((format (printf, 1, 2)))  #define printflike(a, b) __attribute__ ((format (printf, a, b)))
 #define printflike2 __attribute__ ((format (printf, 2, 3)))  
 #define printflike3 __attribute__ ((format (printf, 3, 4)))  
 #define printflike4 __attribute__ ((format (printf, 4, 5)))  
 #define printflike5 __attribute__ ((format (printf, 5, 6)))  
   
 /* Number of items in array. */  /* Number of items in array. */
 #ifndef nitems  #ifndef nitems
Line 1515 
Line 1511 
 RB_PROTOTYPE(format_tree, format_entry, entry, format_cmp);  RB_PROTOTYPE(format_tree, format_entry, entry, format_cmp);
 struct format_tree *format_create(void);  struct format_tree *format_create(void);
 void             format_free(struct format_tree *);  void             format_free(struct format_tree *);
 void printflike3 format_add(struct format_tree *, const char *, const char *,  void printflike(3, 4) format_add(struct format_tree *, const char *,
                      ...);                       const char *, ...);
 const char      *format_find(struct format_tree *, const char *);  const char      *format_find(struct format_tree *, const char *);
 char            *format_expand(struct format_tree *, const char *);  char            *format_expand(struct format_tree *, const char *);
 void             format_session(struct format_tree *, struct session *);  void             format_session(struct format_tree *, struct session *);
Line 1569 
Line 1565 
 struct options_entry *options_find1(struct options *, const char *);  struct options_entry *options_find1(struct options *, const char *);
 struct options_entry *options_find(struct options *, const char *);  struct options_entry *options_find(struct options *, const char *);
 void    options_remove(struct options *, const char *);  void    options_remove(struct options *, const char *);
 struct options_entry *printflike3 options_set_string(struct options *,  struct options_entry *printflike(3, 4) options_set_string(struct options *,
             const char *, const char *, ...);              const char *, const char *, ...);
 char   *options_get_string(struct options *, const char *);  char   *options_get_string(struct options *, const char *);
 struct options_entry *options_set_number(struct options *, const char *,  struct options_entry *options_set_number(struct options *, const char *,
Line 1836 
Line 1832 
 /* cmd-queue.c */  /* cmd-queue.c */
 struct cmd_q    *cmdq_new(struct client *);  struct cmd_q    *cmdq_new(struct client *);
 int              cmdq_free(struct cmd_q *);  int              cmdq_free(struct cmd_q *);
 void printflike2 cmdq_print(struct cmd_q *, const char *, ...);  void printflike(2, 3) cmdq_print(struct cmd_q *, const char *, ...);
 void printflike2 cmdq_error(struct cmd_q *, const char *, ...);  void printflike(2, 3) cmdq_error(struct cmd_q *, const char *, ...);
 int              cmdq_guard(struct cmd_q *, const char *, int);  int              cmdq_guard(struct cmd_q *, const char *, int);
 void             cmdq_run(struct cmd_q *, struct cmd_list *);  void             cmdq_run(struct cmd_q *, struct cmd_list *);
 void             cmdq_append(struct cmd_q *, struct cmd_list *);  void             cmdq_append(struct cmd_q *, struct cmd_list *);
Line 1932 
Line 1928 
 void     status_update_jobs(struct client *);  void     status_update_jobs(struct client *);
 void     status_set_window_at(struct client *, u_int);  void     status_set_window_at(struct client *, u_int);
 int      status_redraw(struct client *);  int      status_redraw(struct client *);
 char    *status_replace(struct client *, struct session *,  char    *status_replace(struct client *, struct session *, struct winlink *,
              struct winlink *, struct window_pane *, const char *, time_t, int);               struct window_pane *, const char *, time_t, int);
 void printflike2 status_message_set(struct client *, const char *, ...);  void printflike(2, 3) status_message_set(struct client *, const char *, ...);
 void     status_message_clear(struct client *);  void     status_message_clear(struct client *);
 int      status_message_redraw(struct client *);  int      status_message_redraw(struct client *);
 void     status_prompt_set(struct client *, const char *, const char *,  void     status_prompt_set(struct client *, const char *, const char *,
Line 2024 
Line 2020 
              struct screen_write_ctx *, struct window_pane *, struct screen *);               struct screen_write_ctx *, struct window_pane *, struct screen *);
 void     screen_write_stop(struct screen_write_ctx *);  void     screen_write_stop(struct screen_write_ctx *);
 void     screen_write_reset(struct screen_write_ctx *);  void     screen_write_reset(struct screen_write_ctx *);
 size_t printflike2 screen_write_cstrlen(int, const char *, ...);  size_t printflike(2, 3) screen_write_cstrlen(int, const char *, ...);
 void printflike5 screen_write_cnputs(struct screen_write_ctx *,  void printflike(5, 6) screen_write_cnputs(struct screen_write_ctx *,
              ssize_t, struct grid_cell *, int, const char *, ...);               ssize_t, struct grid_cell *, int, const char *, ...);
 size_t printflike2 screen_write_strlen(int, const char *, ...);  size_t printflike(2, 3) screen_write_strlen(int, const char *, ...);
 void printflike3 screen_write_puts(struct screen_write_ctx *,  void printflike(3, 4) screen_write_puts(struct screen_write_ctx *,
              struct grid_cell *, const char *, ...);               struct grid_cell *, const char *, ...);
 void printflike5 screen_write_nputs(struct screen_write_ctx *,  void printflike(5, 6) screen_write_nputs(struct screen_write_ctx *,
              ssize_t, struct grid_cell *, int, const char *, ...);               ssize_t, struct grid_cell *, int, const char *, ...);
 void     screen_write_vnputs(struct screen_write_ctx *,  void     screen_write_vnputs(struct screen_write_ctx *,
              ssize_t, struct grid_cell *, int, const char *, va_list);               ssize_t, struct grid_cell *, int, const char *, va_list);
Line 2214 
Line 2210 
 extern const struct window_mode window_copy_mode;  extern const struct window_mode window_copy_mode;
 void             window_copy_init_from_pane(struct window_pane *);  void             window_copy_init_from_pane(struct window_pane *);
 void             window_copy_init_for_output(struct window_pane *);  void             window_copy_init_for_output(struct window_pane *);
 void printflike2 window_copy_add(struct window_pane *, const char *, ...);  void printflike(2, 3) window_copy_add(struct window_pane *, const char *, ...);
 void             window_copy_vadd(struct window_pane *, const char *, va_list);  void             window_copy_vadd(struct window_pane *, const char *, va_list);
 void             window_copy_pageup(struct window_pane *);  void             window_copy_pageup(struct window_pane *);
   
Line 2253 
Line 2249 
   
 /* control.c */  /* control.c */
 void    control_callback(struct client *, int, void *);  void    control_callback(struct client *, int, void *);
 void printflike2 control_write(struct client *, const char *, ...);  void printflike(2, 3) control_write(struct client *, const char *, ...);
 void    control_write_buffer(struct client *, struct evbuffer *);  void    control_write_buffer(struct client *, struct evbuffer *);
   
 /* control-notify.c */  /* control-notify.c */
Line 2324 
Line 2320 
 /* log.c */  /* log.c */
 void             log_open(const char *);  void             log_open(const char *);
 void             log_close(void);  void             log_close(void);
 void printflike1 log_debug(const char *, ...);  void printflike(1, 2) log_debug(const char *, ...);
 __dead void printflike1 log_fatal(const char *, ...);  __dead void printflike(1, 2) log_fatal(const char *, ...);
 __dead void printflike1 log_fatalx(const char *, ...);  __dead void printflike(1, 2) log_fatalx(const char *, ...);
   
 /* xmalloc.c */  /* xmalloc.c */
 char            *xstrdup(const char *);  char            *xstrdup(const char *);
Line 2334 
Line 2330 
 void            *xmalloc(size_t);  void            *xmalloc(size_t);
 void            *xrealloc(void *, size_t);  void            *xrealloc(void *, size_t);
 void            *xreallocarray(void *, size_t, size_t);  void            *xreallocarray(void *, size_t, size_t);
 int printflike2  xasprintf(char **, const char *, ...);  int printflike(2, 3) xasprintf(char **, const char *, ...);
 int              xvasprintf(char **, const char *, va_list);  int              xvasprintf(char **, const char *, va_list);
 int printflike3  xsnprintf(char *, size_t, const char *, ...);  int printflike(3, 4) xsnprintf(char *, size_t, const char *, ...);
 int              xvsnprintf(char *, size_t, const char *, va_list);  int              xvsnprintf(char *, size_t, const char *, va_list);
   
 /* style.c */  /* style.c */

Legend:
Removed from v.1.475  
changed lines
  Added in v.1.476