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

Diff for /src/usr.bin/tmux/cmd-lock-server.c between version 1.13 and 1.14

version 1.13, 2013/03/24 09:27:19 version 1.14, 2013/03/24 09:54:10
Line 28 
Line 28 
  * Lock commands.   * Lock commands.
  */   */
   
 enum cmd_retval  cmd_lock_server_exec(struct cmd *, struct cmd_ctx *);  enum cmd_retval  cmd_lock_server_exec(struct cmd *, struct cmd_q *);
   
 const struct cmd_entry cmd_lock_server_entry = {  const struct cmd_entry cmd_lock_server_entry = {
         "lock-server", "lock",          "lock-server", "lock",
Line 61 
Line 61 
 };  };
   
 enum cmd_retval  enum cmd_retval
 cmd_lock_server_exec(struct cmd *self, unused struct cmd_ctx *ctx)  cmd_lock_server_exec(struct cmd *self, unused struct cmd_q *cmdq)
 {  {
         struct args     *args = self->args;          struct args     *args = self->args;
         struct client   *c;          struct client   *c;
Line 70 
Line 70 
         if (self->entry == &cmd_lock_server_entry)          if (self->entry == &cmd_lock_server_entry)
                 server_lock();                  server_lock();
         else if (self->entry == &cmd_lock_session_entry) {          else if (self->entry == &cmd_lock_session_entry) {
                 if ((s = cmd_find_session(ctx, args_get(args, 't'), 0)) == NULL)                  s = cmd_find_session(cmdq, args_get(args, 't'), 0);
                   if (s == NULL)
                         return (CMD_RETURN_ERROR);                          return (CMD_RETURN_ERROR);
                 server_lock_session(s);                  server_lock_session(s);
         } else {          } else {
                 if ((c = cmd_find_client(ctx, args_get(args, 't'), 0)) == NULL)                  c = cmd_find_client(cmdq, args_get(args, 't'), 0);
                   if (c == NULL)
                         return (CMD_RETURN_ERROR);                          return (CMD_RETURN_ERROR);
                 server_lock_client(c);                  server_lock_client(c);
         }          }

Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14