Merge branch 'topic/format-cleanup' of git://valera-ext.nynaeve.net/silc into silc...

diff --combined apps/silcd/server.c
index 2f97d79d837aaeee25893ad676f2f5cd1dab382d,501fc671ac228d0ef2d980b85705f6d884799e98..2ed570783b6030c8a28b4299859d0398a4c70555
--- 1/apps/silcd/server.c
--- 2/apps/silcd/server.c
+++ b/apps/silcd/server.c
@@@ -2911,18 -2911,6 +2911,18 @@@ static void silc_server_rekey_completio
                                 sock, idata->sconn->rekey_timeout, 0);
  }
  
 +/* Helper to stop future rekeys on a link. */
 +void silc_server_stop_rekey(SilcServer server, SilcClientEntry client)
 +{
 +  if (!client->connection)
 +    return;
 +
 +  SILC_LOG_DEBUG(("Stopping rekey for client %p", client));
 +
 +  silc_schedule_task_del_by_all(server->schedule, 0, silc_server_do_rekey,
 +                              client->connection);
 +}
 +
  /* Rekey callback.  Start rekey as initiator */
  
  SILC_TASK_CALLBACK(silc_server_do_rekey)
@@@ -5030,7 -5018,7 +5030,7 @@@ void silc_server_save_users_on_channel(
      }
  
      if (!(client->data.status & SILC_IDLIST_STATUS_REGISTERED)) {
-       SILC_LOG_ERROR(("Attempting to add unregistered client to channel ",
+       SILC_LOG_ERROR(("Attempting to add unregistered client to channel "
                      "%s", channel->channel_name));
        continue;
      }