[BACK]Return to cmd-source-file.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/cmd-source-file.c between version 1.29 and 1.30

version 1.29, 2016/10/16 17:55:14 version 1.30, 2016/10/16 19:04:05
Line 26 
Line 26 
  * Sources a configuration file.   * Sources a configuration file.
  */   */
   
 static enum cmd_retval  cmd_source_file_exec(struct cmd *, struct cmd_q *);  static enum cmd_retval  cmd_source_file_exec(struct cmd *, struct cmdq_item *);
   
 static enum cmd_retval  cmd_source_file_done(struct cmd_q *, void *);  static enum cmd_retval  cmd_source_file_done(struct cmdq_item *, void *);
   
 const struct cmd_entry cmd_source_file_entry = {  const struct cmd_entry cmd_source_file_entry = {
         .name = "source-file",          .name = "source-file",
Line 42 
Line 42 
 };  };
   
 static enum cmd_retval  static enum cmd_retval
 cmd_source_file_exec(struct cmd *self, struct cmd_q *cmdq)  cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
 {  {
         struct args     *args = self->args;          struct args             *args = self->args;
         struct client   *c = cmdq->client;          struct client           *c = item->client;
         int              quiet;          int                      quiet;
         struct cmd_q    *new_cmdq;          struct cmdq_item        *new_item;
   
         quiet = args_has(args, 'q');          quiet = args_has(args, 'q');
         switch (load_cfg(args->argv[0], c, cmdq, quiet)) {          switch (load_cfg(args->argv[0], c, item, quiet)) {
         case -1:          case -1:
                 if (cfg_finished)                  if (cfg_finished)
                         cfg_print_causes(cmdq);                          cfg_print_causes(item);
                 return (CMD_RETURN_ERROR);                  return (CMD_RETURN_ERROR);
         case 0:          case 0:
                 if (cfg_finished)                  if (cfg_finished)
                         cfg_print_causes(cmdq);                          cfg_print_causes(item);
                 return (CMD_RETURN_NORMAL);                  return (CMD_RETURN_NORMAL);
         }          }
         if (cfg_finished) {          if (cfg_finished) {
                 new_cmdq = cmdq_get_callback(cmd_source_file_done, NULL);                  new_item = cmdq_get_callback(cmd_source_file_done, NULL);
                 cmdq_insert_after(cmdq, new_cmdq);                  cmdq_insert_after(item, new_item);
         }          }
         return (CMD_RETURN_NORMAL);          return (CMD_RETURN_NORMAL);
 }  }
   
 static enum cmd_retval  static enum cmd_retval
 cmd_source_file_done(struct cmd_q *cmdq, __unused void *data)  cmd_source_file_done(struct cmdq_item *item, __unused void *data)
 {  {
         cfg_print_causes(cmdq);          cfg_print_causes(item);
         return (CMD_RETURN_NORMAL);          return (CMD_RETURN_NORMAL);
 }  }
Legend:
Removed from v.1.29  
changed lines
  Added in v.1.30