/pidgin/main: 47964e26263e: Assorted whitespace fixes.
Mark Doliner
mark at kingant.net
Fri Dec 6 03:02:42 EST 2013
Changeset: 47964e26263e312e9e4bc92209f0709ece6cb737
Author: Mark Doliner <mark at kingant.net>
Date: 2013-12-06 00:02 -0800
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/47964e26263e
Description:
Assorted whitespace fixes.
Mostly deleting some stray whitespace. Also a few spaces to tabs,
and indent more than 1 tab on wrapped lines.
diffstat:
libpurple/cipher.h | 2 +-
libpurple/ciphers/descipher.c | 11 +++++------
libpurple/ciphers/rc4cipher.c | 8 ++++----
libpurple/circularbuffer.c | 6 +++---
pidgin/gtkwebviewtoolbar.c | 2 +-
5 files changed, 14 insertions(+), 15 deletions(-)
diffs (118 lines):
diff --git a/libpurple/cipher.h b/libpurple/cipher.h
--- a/libpurple/cipher.h
+++ b/libpurple/cipher.h
@@ -57,7 +57,7 @@ typedef struct _PurpleHashClass PurpleH
*
* Modes for batch encrypters
*/
-typedef enum {
+typedef enum {
PURPLE_CIPHER_BATCH_MODE_ECB,
PURPLE_CIPHER_BATCH_MODE_CBC
} PurpleCipherBatchMode;
diff --git a/libpurple/ciphers/descipher.c b/libpurple/ciphers/descipher.c
--- a/libpurple/ciphers/descipher.c
+++ b/libpurple/ciphers/descipher.c
@@ -5,12 +5,12 @@
* Copyright (C) 1998 Free Software Foundation, Inc.
*
* Please see below for more legal information!
- *
+ *
* According to the definition of DES in FIPS PUB 46-2 from December 1993.
* For a description of triple encryption, see:
* Bruce Schneier: Applied Cryptography. Second Edition.
* John Wiley & Sons, 1996. ISBN 0-471-12845-7. Pages 358 ff.
- *
+ *
* Purple is the legal property of its developers, whose names are too numerous
* to list here. Please refer to the COPYRIGHT file distributed with this
* source distribution.
@@ -63,7 +63,7 @@ enum {
static GObjectClass *parent_class = NULL;
static GParamSpec *properties[PROP_LAST];
-/*
+/*
* The s-box values are permuted according to the 'primitive function P'
*/
static guint32 sbox1[64] = {
@@ -275,11 +275,11 @@ static guint8 encrypt_rotate_tab[16] = {
* 16 encryption rounds.
* To calculate subkeys for decryption the caller
* have to reorder the generated subkeys.
- *
+ *
* rawkey: 8 Bytes of key data
* subkey: Array of at least 32 guint32s. Will be filled
* with calculated subkeys.
- *
+ *
*/
static void
purple_des_cipher_key_schedule(const guint8 * rawkey, guint32 * subkey) {
@@ -579,4 +579,3 @@ PurpleCipher *
purple_des_cipher_new(void) {
return g_object_new(PURPLE_TYPE_DES_CIPHER, NULL);
}
-
diff --git a/libpurple/ciphers/rc4cipher.c b/libpurple/ciphers/rc4cipher.c
--- a/libpurple/ciphers/rc4cipher.c
+++ b/libpurple/ciphers/rc4cipher.c
@@ -31,10 +31,10 @@
(G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_RC4_CIPHER, PurpleRC4CipherPrivate))
typedef struct {
- guchar state[256];
- guchar x;
- guchar y;
- gint key_len;
+ guchar state[256];
+ guchar x;
+ guchar y;
+ gint key_len;
} PurpleRC4CipherPrivate;
/******************************************************************************
diff --git a/libpurple/circularbuffer.c b/libpurple/circularbuffer.c
--- a/libpurple/circularbuffer.c
+++ b/libpurple/circularbuffer.c
@@ -54,7 +54,7 @@ typedef struct {
/** A pointer to the next byte of buffered data that should be
* read by the consumer. */
- gchar *output;
+ gchar *output;
} PurpleCircularBufferPrivate;
/******************************************************************************
@@ -225,7 +225,7 @@ purple_circular_buffer_set_grow_size(Pur
gsize grow_size)
{
PurpleCircularBufferPrivate *priv =
- PURPLE_CIRCULAR_BUFFER_GET_PRIVATE(buffer);
+ PURPLE_CIRCULAR_BUFFER_GET_PRIVATE(buffer);
priv->growsize = (grow_size != 0) ? grow_size : DEFAULT_BUF_SIZE;
@@ -249,7 +249,7 @@ purple_circular_buffer_get_input(const P
static void
purple_circular_buffer_finalize(GObject *obj) {
PurpleCircularBufferPrivate *priv =
- PURPLE_CIRCULAR_BUFFER_GET_PRIVATE(obj);
+ PURPLE_CIRCULAR_BUFFER_GET_PRIVATE(obj);
g_free(priv->buffer);
diff --git a/pidgin/gtkwebviewtoolbar.c b/pidgin/gtkwebviewtoolbar.c
--- a/pidgin/gtkwebviewtoolbar.c
+++ b/pidgin/gtkwebviewtoolbar.c
@@ -1529,7 +1529,7 @@ gtk_webviewtoolbar_init(GtkWebViewToolba
gtk_action_set_sensitive(priv->attention, FALSE);
gtk_action_set_sensitive(priv->smiley,
- pidgin_themes_get_proto_smileys(NULL) != NULL);
+ pidgin_themes_get_proto_smileys(NULL) != NULL);
purple_prefs_connect_callback(toolbar,
PIDGIN_PREFS_ROOT "/conversations/toolbar/wide",
More information about the Commits
mailing list