[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-53
|
From: |
Daniele Forsi |
|
Subject: |
[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-538-g3f04ca7 |
|
Date: |
Wed, 01 Jan 2014 15:35:35 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".
The branch, master has been updated
via 3f04ca7095c12a514d300144c7290fe8b4859a5e (commit)
from 252d10102264e0fcc7fa9a6d382185da5a4d217b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=3f04ca7095c12a514d300144c7290fe8b4859a5e
commit 3f04ca7095c12a514d300144c7290fe8b4859a5e
Author: Daniele Forsi <address@hidden>
Date: Wed Jan 1 16:32:42 2014 +0100
More trivial whitespace fixes
I didn't remove trailing spaces from lsusb output.
To see if only whitespace has been modified, use:
git log --patch --ignore-all-space
diff --git a/common/cfgreader.c b/common/cfgreader.c
index 89af7ba..d3d8cdb 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -1013,9 +1013,9 @@ static bool cfg_get_log_target(gn_log_target *t, const
char *opt)
/*
* get_locations() returns the list of possible config file locations that
* may be used on the given system. It returns the array of paths to the
- * config files. @retval parameter denotes how many locations are returned.
+ * config files. @retval parameter denotes how many locations are returned.
* The resulting array needs to be freed afterwards.
- */
+ */
#ifdef WIN32
/* Windows version */
static char **get_locations(int *retval)
diff --git a/common/compat.c b/common/compat.c
index c319c9e..a1e1a9b 100644
--- a/common/compat.c
+++ b/common/compat.c
@@ -126,7 +126,7 @@ int gettimeofday(struct timeval *tv, void *tz)
#include <stdio.h>
-/*
+/*
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)strsep.c 8.1 (Berkeley) 6/4/93";
#endif */ /* LIBC_SCCS and not lint */
diff --git a/common/data/virtmodem.c b/common/data/virtmodem.c
index ee4163e..4b3f9ac 100644
--- a/common/data/virtmodem.c
+++ b/common/data/virtmodem.c
@@ -76,7 +76,7 @@
/* Defines */
-#ifndef AF_LOCAL
+#ifndef AF_LOCAL
# ifdef AF_UNIX
# define AF_LOCAL AF_UNIX
# else
diff --git a/common/devices/dku2libusb.c b/common/devices/dku2libusb.c
index 3308391..f219c39 100644
--- a/common/devices/dku2libusb.c
+++ b/common/devices/dku2libusb.c
@@ -57,7 +57,7 @@ int fbusdku2usb_select(struct timeval *timeout, struct
gn_statemachine *state)
#define DEVINSTANCE(s) (*((fbus_usb_interface
**)(&(s)->device.device_instance)))
/*
- * Helper function to usbfbus_find_interfaces
+ * Helper function to usbfbus_find_interfaces
*/
static void find_eps(struct fbus_usb_interface_transport *iface,
struct usb_interface_descriptor data_iface,
@@ -68,9 +68,9 @@ static void find_eps(struct fbus_usb_interface_transport
*iface,
if (data_iface.bNumEndpoints == 2) {
ep0 = data_iface.endpoint;
ep1 = data_iface.endpoint + 1;
- if ((ep0->bEndpointAddress & USB_ENDPOINT_IN) &&
- ((ep0->bmAttributes & USB_ENDPOINT_TYPE_MASK) ==
USB_ENDPOINT_TYPE_BULK) &&
- !(ep1->bEndpointAddress & USB_ENDPOINT_IN) &&
+ if ((ep0->bEndpointAddress & USB_ENDPOINT_IN) &&
+ ((ep0->bmAttributes & USB_ENDPOINT_TYPE_MASK) ==
USB_ENDPOINT_TYPE_BULK) &&
+ !(ep1->bEndpointAddress & USB_ENDPOINT_IN) &&
((ep1->bmAttributes & USB_ENDPOINT_TYPE_MASK) ==
USB_ENDPOINT_TYPE_BULK)) {
*found_active = 1;
iface->data_active_setting =
data_iface.bAlternateSetting;
@@ -78,9 +78,9 @@ static void find_eps(struct fbus_usb_interface_transport
*iface,
iface->data_endpoint_read = ep0->bEndpointAddress;
iface->data_endpoint_write = ep1->bEndpointAddress;
}
- if (!(ep0->bEndpointAddress & USB_ENDPOINT_IN) &&
- ((ep0->bmAttributes & USB_ENDPOINT_TYPE_MASK) ==
USB_ENDPOINT_TYPE_BULK) &&
- (ep1->bEndpointAddress & USB_ENDPOINT_IN) &&
+ if (!(ep0->bEndpointAddress & USB_ENDPOINT_IN) &&
+ ((ep0->bmAttributes & USB_ENDPOINT_TYPE_MASK) ==
USB_ENDPOINT_TYPE_BULK) &&
+ (ep1->bEndpointAddress & USB_ENDPOINT_IN) &&
((ep1->bmAttributes & USB_ENDPOINT_TYPE_MASK) ==
USB_ENDPOINT_TYPE_BULK)) {
*found_active = 1;
iface->data_active_setting =
data_iface.bAlternateSetting;
@@ -97,7 +97,7 @@ static void find_eps(struct fbus_usb_interface_transport
*iface,
}
/*
- * Helper function to usbfbus_find_interfaces
+ * Helper function to usbfbus_find_interfaces
*/
static int find_fbus_data_interface(unsigned char *buffer, int buflen,
struct usb_config_descriptor config,
@@ -180,7 +180,7 @@ static int get_iface_string(struct usb_dev_handle
*usb_handle, char **string, in
}
/*
- * Helper function to usbfbus_find_interfaces
+ * Helper function to usbfbus_find_interfaces
*/
static struct fbus_usb_interface_transport *check_iface(struct usb_device
*dev, int c, int i, int a,
struct
fbus_usb_interface_transport *current)
@@ -272,7 +272,7 @@ static int usbfbus_find_interfaces(struct gn_statemachine
*state)
/* Take N-th device on the list */
while (--n && current) {
- tmp = current;
+ tmp = current;
current = current->next;
/* free the previous element on the list -- won't be needed
anymore */
free(tmp);
@@ -288,19 +288,19 @@ static int usbfbus_find_interfaces(struct gn_statemachine
*state)
usb_handle = usb_open(current->device);
if (usb_handle == NULL)
goto cleanup_list;
- get_iface_string(usb_handle, &DEVINSTANCE(state)->manufacturer,
+ get_iface_string(usb_handle, &DEVINSTANCE(state)->manufacturer,
current->device->descriptor.iManufacturer);
- get_iface_string(usb_handle, &DEVINSTANCE(state)->product,
+ get_iface_string(usb_handle, &DEVINSTANCE(state)->product,
current->device->descriptor.iProduct);
- get_iface_string(usb_handle, &DEVINSTANCE(state)->serial,
+ get_iface_string(usb_handle, &DEVINSTANCE(state)->serial,
current->device->descriptor.iSerialNumber);
- get_iface_string(usb_handle,
&DEVINSTANCE(state)->configuration,
+ get_iface_string(usb_handle, &DEVINSTANCE(state)->configuration,
current->configuration_description);
- get_iface_string(usb_handle,
&DEVINSTANCE(state)->control_interface,
+ get_iface_string(usb_handle,
&DEVINSTANCE(state)->control_interface,
current->control_interface_description);
- get_iface_string(usb_handle,
&DEVINSTANCE(state)->data_interface_idle,
+ get_iface_string(usb_handle,
&DEVINSTANCE(state)->data_interface_idle,
current->data_interface_idle_description);
- get_iface_string(usb_handle,
&DEVINSTANCE(state)->data_interface_active,
+ get_iface_string(usb_handle,
&DEVINSTANCE(state)->data_interface_active,
current->data_interface_active_description);
usb_close(usb_handle);
retval = 1;
@@ -412,10 +412,10 @@ static int usbfbus_disconnect_request(struct
gn_statemachine *state)
if (ret < 0)
dprintf("Can't set data idle setting %d\n", ret);
ret = usb_release_interface(DEVINSTANCE(state)->interface->dev_data,
DEVINSTANCE(state)->interface->data_interface);
- if (ret < 0)
+ if (ret < 0)
dprintf("Can't release data interface %d\n", ret);
ret = usb_release_interface(DEVINSTANCE(state)->interface->dev_data,
DEVINSTANCE(state)->interface->control_interface);
- if (ret < 0)
+ if (ret < 0)
dprintf("Can't release control interface %d\n", ret);
ret = usb_close(DEVINSTANCE(state)->interface->dev_data);
if (ret < 0)
diff --git a/common/devices/unixbluetooth.c b/common/devices/unixbluetooth.c
index 7fc69a0..c9be96f 100644
--- a/common/devices/unixbluetooth.c
+++ b/common/devices/unixbluetooth.c
@@ -50,7 +50,7 @@
#ifdef HAVE_BLUETOOTH_NETBT /* FreeBSD / netbt */
#include <bluetooth.h>
-#include <sdp.h>
+#include <sdp.h>
#define GNOKII_SERIAL_PORT_CLASS SDP_SERVICE_CLASS_SERIAL_PORT
#define GNOKII_DIALUP_NETWORK_CLASS SDP_SERVICE_CLASS_DIALUP_NETWORKING
@@ -109,7 +109,7 @@ static int find_service_channel(bdaddr_t *adapter, bdaddr_t
*device, int only_gn
for (i = 0; i < values_len; i ++) {
values[i].flags = SDP_ATTR_INVALID;
values[i].attr = 0;
- values[i].vlen = BSIZE;
+ values[i].vlen = BSIZE;
values[i].value = buffer[i];
}
diff --git a/common/devices/unixserial.c b/common/devices/unixserial.c
index e4eefc4..34dd9c1 100644
--- a/common/devices/unixserial.c
+++ b/common/devices/unixserial.c
@@ -11,7 +11,7 @@
Copyright (C) 2002 Ladis Michl, Pavel Machek
Copyright (C) 2001-2011 Pawel Kot
Copyright (C) 2002-2004 BORBELY Zoltan
-
+
*/
#include "config.h"
diff --git a/common/gsm-api.c b/common/gsm-api.c
index f105cb9..341ca27 100644
--- a/common/gsm-api.c
+++ b/common/gsm-api.c
@@ -43,17 +43,17 @@
#if defined(WIN32) && defined(_USRDLL)
-/*
+/*
* Define the entry point for the DLL application.
*
* We don't do anything special here (yet) but the code is needed
* in order to create a DLL.
*/
-BOOL APIENTRY DllMain(HANDLE hModule,
- DWORD ul_reason_for_call,
+BOOL APIENTRY DllMain(HANDLE hModule,
+ DWORD ul_reason_for_call,
LPVOID lpReserved)
{
- /*
+ /*
* For now this is enough to satisfy the compiler and linker.
* Currently no extra code is needed for initializing or
* deinitializing of the DLL.
diff --git a/common/gsm-auth.c b/common/gsm-auth.c
index 87301c9..69c3c2a 100644
--- a/common/gsm-auth.c
+++ b/common/gsm-auth.c
@@ -7,7 +7,7 @@
This file is part of gnokii.
Copyright (C) 2011 PaweÅ Kot
-
+
Functions for initialization authentication.
*/
diff --git a/common/gsm-bitmaps.c b/common/gsm-bitmaps.c
index 0355223..3dcaedf 100644
--- a/common/gsm-bitmaps.c
+++ b/common/gsm-bitmaps.c
@@ -132,7 +132,7 @@ GNOKII_API void gn_bmp_resize(gn_bmp *bitmap, gn_bmp_types
target, gn_phone *inf
bitmap->height = info->startup_logo_height;
if (info->models && ((!strncmp(info->models, "6510", 4)) ||
(!strncmp(info->models, "7110", 4))))
bitmap->size = ceiling_to_octet(bitmap->height) *
bitmap->width;
- else
+ else
bitmap->size = ceiling_to_octet(bitmap->height *
bitmap->width);
break;
case GN_BMP_NewOperatorLogo:
diff --git a/common/gsm-common.c b/common/gsm-common.c
index 8e8a76c..02d0ec3 100644
--- a/common/gsm-common.c
+++ b/common/gsm-common.c
@@ -694,9 +694,9 @@ GNOKII_API void
gn_phonebook_entry_sanitize(gn_phonebook_entry *entry)
}
}
-/*
+/*
* This very small function is just to make it easier to clear
- * the data struct every time one is created
+ * the data struct every time one is created
*/
GNOKII_API void gn_data_clear(gn_data *data)
{
diff --git a/common/gsm-encoding.c b/common/gsm-encoding.c
index 6b27486..b60ae8a 100644
--- a/common/gsm-encoding.c
+++ b/common/gsm-encoding.c
@@ -182,7 +182,7 @@ static const char *get_langinfo_codeset(void)
GNOKII_API const char *gn_char_get_encoding()
{
const char *coding;
- if (*application_encoding)
+ if (*application_encoding)
coding = application_encoding; /* app has overriden encoding
setting */
else
coding = get_langinfo_codeset(); /* return default codeset */
@@ -539,7 +539,7 @@ gn_sms_dcs_alphabet_type
char_def_alphabet_string_stats(char *str, int *enc_char
* Returns: number of characters copied
*
* Function copies @len characters from @src utf-8 string, starting at @offset
character to @dest.
- *
+ *
*/
int char_def_alphabet_string_copy(char *dest, const char *src, int len, int
offset)
{
diff --git a/common/gsm-networks.c b/common/gsm-networks.c
index c81ca46..8632321 100644
--- a/common/gsm-networks.c
+++ b/common/gsm-networks.c
@@ -1327,7 +1327,7 @@ GNOKII_API char *gn_country_name_get(char *country_code)
GNOKII_API char *gn_country_code_get(char *country_name)
{
- /*
+ /*
* If the iso-codes package is installed and NLS is enabled
* @country_name must be given in the current language.
*/
diff --git a/common/gsm-ringtones.c b/common/gsm-ringtones.c
index 6f2770b..8fcf78d 100644
--- a/common/gsm-ringtones.c
+++ b/common/gsm-ringtones.c
@@ -10,7 +10,7 @@
Copyright (C) 2001 Chris Kemp, Marcin Wiacek
Copyright (C) 2002 Pavel Machek <address@hidden>
Copyright (C) 2002-2004 Pawel Kot
- Copyright (C) 2002-2003 BORBELY Zoltan
+ Copyright (C) 2002-2003 BORBELY Zoltan
This file provides support for ringtones.
diff --git a/common/gsm-sms.c b/common/gsm-sms.c
index 7c92b7c..08e7199 100644
--- a/common/gsm-sms.c
+++ b/common/gsm-sms.c
@@ -11,7 +11,7 @@
Copyright (C) 2002-2003 Ladis Michl
Copyright (C) 2003-2004 BORBELY Zoltan
Copyright (C) 2006 Igor Popik
-
+
Library for parsing and creating Short Messages (SMS).
*/
@@ -1853,7 +1853,7 @@ static gn_error sms_send_single(gn_data *data, struct
gn_statemachine *state)
return error;
}
-/*
+/*
* FIXME: we stop sending multipart message on first error. We may end up
* with few messages send, and few failed. We're not able to resend only
* failed ones.
diff --git a/common/ldif.c b/common/ldif.c
index 6e40313..a590b21 100644
--- a/common/ldif.c
+++ b/common/ldif.c
@@ -221,7 +221,7 @@ GNOKII_API int gn_ldif2phonebook(FILE *f,
gn_phonebook_entry *entry)
case GN_PHONEBOOK_NUMBER_None:
case GN_PHONEBOOK_NUMBER_Common:
case GN_PHONEBOOK_NUMBER_General:
- case GN_PHONEBOOK_NUMBER_Work:
+ case GN_PHONEBOOK_NUMBER_Work:
case GN_PHONEBOOK_NUMBER_Home:
case GN_PHONEBOOK_NUMBER_Mobile:
dprintf("setting default number to %s\n",
entry->subentries[i].data.number);
diff --git a/common/libfunctions.c b/common/libfunctions.c
index 888ff81..a056f8a 100644
--- a/common/libfunctions.c
+++ b/common/libfunctions.c
@@ -361,7 +361,7 @@ GNOKII_API int gn_lib_get_pb_num_subentries( struct
gn_statemachine *state )
}
GNOKII_API gn_error gn_lib_get_pb_subentry( struct gn_statemachine *state,
const int index,
- gn_phonebook_entry_type *entry_type, gn_phonebook_number_type
*number_type,
+ gn_phonebook_entry_type *entry_type, gn_phonebook_number_type
*number_type,
const char **number )
{
if (entry_type) *entry_type =
state->u.pb_entry.subentries[index].entry_type;
@@ -517,7 +517,7 @@ static struct { gn_connection_type ct; const char *str; }
connectiontypes[] = {
};
GNOKII_API gn_connection_type gn_get_connectiontype(const char
*connection_type_string)
-{
+{
int i;
for (i = 0; i < sizeof(connectiontypes)/sizeof(connectiontypes[0]); i++)
if (!strcasecmp(connection_type_string, connectiontypes[i].str))
diff --git a/common/links/atbus.c b/common/links/atbus.c
index e035d9f..3630368 100644
--- a/common/links/atbus.c
+++ b/common/links/atbus.c
@@ -36,7 +36,7 @@
/* ugly hack, but we need GN_OP_AT_Ring -- bozo */
#include "phones/atgen.h"
-/*
+/*
* FIXME - when sending an AT command while another one is still in progress,
* the old command is aborted and the new ignored. the result is _one_ error
* message from the phone.
@@ -72,7 +72,7 @@ static bool atbus_open(int mode, char *device, struct
gn_statemachine *sm)
return false;
}
if (mode) {
- /*
+ /*
* make 7110 with dlr-3 happy. the nokia dlr-3 cable provides
* hardware handshake lines but is, at least at initialization,
* slow. to be properly detected, state changes must be longer
@@ -125,9 +125,9 @@ int numchar(unsigned char *str, unsigned char ch)
return count;
}
-/*
+/*
* rx state machine for receive handling. called once for each character
- * received from the phone.
+ * received from the phone.
*/
static void atbus_rx_statemachine(unsigned char rx_char, struct
gn_statemachine *sm)
{
diff --git a/common/links/cbus.c b/common/links/cbus.c
index 9bf7610..59bf64b 100644
--- a/common/links/cbus.c
+++ b/common/links/cbus.c
@@ -275,9 +275,9 @@ static bool cbus_open_serial(char *device, struct
gn_statemachine *state)
return true;
}
-/*
+/*
* This is the main loop function which must be called regularly
- * timeout can be used to make it 'busy' or not
+ * timeout can be used to make it 'busy' or not
*/
static gn_error cbus_loop(struct timeval *timeout, struct gn_statemachine
*state)
{
diff --git a/common/links/fbus-3110.c b/common/links/fbus-3110.c
index 9d5f442..a870867 100644
--- a/common/links/fbus-3110.c
+++ b/common/links/fbus-3110.c
@@ -73,7 +73,7 @@ static bool fb3110_serial_open(struct gn_statemachine *state)
* type. Frames are acknowledged if needed and information about them is
* passed to the main statemachine.
*/
-
+
static void fb3110_rx_frame_handle(fb3110_incoming_frame *i, struct
gn_statemachine *state)
{
int count;
@@ -122,7 +122,7 @@ static void fb3110_rx_frame_handle(fb3110_incoming_frame
*i, struct gn_statemach
}
-/*
+/*
* RX_State machine for receive handling.
* Called once for each character received from the phone.
*/
@@ -201,9 +201,9 @@ static void fb3110_rx_state_machine(unsigned char rx_byte,
struct gn_statemachin
}
-/*
+/*
* This is the main loop function which must be called regularly
- * timeout can be used to make it 'busy' or not
+ * timeout can be used to make it 'busy' or not
*/
static gn_error fb3110_loop(struct timeval *timeout, struct gn_statemachine
*state)
{
@@ -226,10 +226,10 @@ static gn_error fb3110_loop(struct timeval *timeout,
struct gn_statemachine *sta
}
-/*
+/*
* Prepares the message header and sends it, prepends the message start
* byte (0x01) and other values according the value specified when called.
- * Calculates checksum and then sends the lot down the pipe...
+ * Calculates checksum and then sends the lot down the pipe...
*/
static gn_error fb3110_tx_frame_send(u8 frame_type, u8 message_length, u8
message_type, u8 sequence_byte, u8 *buffer, struct gn_statemachine *state)
{
@@ -277,8 +277,8 @@ static gn_error fb3110_tx_frame_send(u8 frame_type, u8
message_length, u8 messag
}
-/*
- * Main function to send an fbus message
+/*
+ * Main function to send an fbus message
*/
static gn_error fb3110_message_send(unsigned int messagesize, unsigned char
messagetype, unsigned char *message, struct gn_statemachine *state)
{
@@ -301,7 +301,7 @@ static gn_error fb3110_message_send(unsigned int
messagesize, unsigned char mess
}
-/*
+/*
* Sends the "standard" acknowledge message back to the phone in response to
* a message it sent automatically or in response to a command sent to it.
*/
@@ -320,7 +320,7 @@ static void fb3110_reset(struct gn_statemachine *state)
FBUSINST(state)->i.state = FB3110_RX_Sync;
}
-/*
+/*
* Initialise variables and start the link
* newlink is actually part of state - but the link code should not
* anything about state. State is only passed around to allow for
@@ -383,7 +383,7 @@ gn_error fb3110_initialise(struct gn_statemachine *state)
/* Any command we originate must have a unique SequenceNumber. Observation to
* date suggests that these values start at 0x10 and cycle up to 0x17
* before repeating again. Perhaps more accurately, the numbers cycle
- * 0,1,2,3..7 with bit 4 of the byte premanently set.
+ * 0,1,2,3..7 with bit 4 of the byte premanently set.
*/
static void fb3110_sequence_number_update(struct gn_statemachine *state)
{
diff --git a/common/links/fbus.c b/common/links/fbus.c
index e77afcf..7c49fd1 100644
--- a/common/links/fbus.c
+++ b/common/links/fbus.c
@@ -127,7 +127,7 @@ static bool at2fbus_serial_open(struct gn_statemachine
*state, gn_connection_typ
perror(_("Couldn't open FBUS device"));
return false;
}
-
+
device_setdtrrts(0, 0, state);
usleep(1000000);
device_setdtrrts(1, 1, state);
@@ -144,14 +144,14 @@ static bool at2fbus_serial_open(struct gn_statemachine
*state, gn_connection_typ
res = send_command("AT*NOKIAFBUS\r\n", 14, state);
device_changespeed(115200, state);
- if (type != GN_CT_Bluetooth && type != GN_CT_TCP) {
+ if (type != GN_CT_Bluetooth && type != GN_CT_TCP) {
for (count = 0; count < 32; count++) {
device_write(&init_char, 1, state);
}
device_write(&end_init_char, 1, state);
usleep(1000000);
}
-
+
return true;
}
diff --git a/common/nokia-decoding.c b/common/nokia-decoding.c
index 35d303f..ee7a77a 100644
--- a/common/nokia-decoding.c
+++ b/common/nokia-decoding.c
@@ -15,7 +15,7 @@
Copyright (C) 2002-2004 BORBELY Zoltan
Copyright (C) 2002 Marcin Wiacek
- This file provides decoding functions specific to the newer
+ This file provides decoding functions specific to the newer
Nokia 7110/6510 series.
*/
@@ -23,7 +23,7 @@
#include "config.h"
#include <time.h>
-#include "gnokii-internal.h"
+#include "gnokii-internal.h"
#include "gnokii.h"
#include "nokia-decoding.h"
#include "compat.h"
@@ -91,7 +91,7 @@ gn_error phonebook_decode(unsigned char *blockstart, int
length, gn_data *data,
else
dprintf("ERROR: no subentry allocated\n");
}
-
+
switch ((gn_phonebook_entry_type)blockstart[0]) {
case GN_PHONEBOOK_ENTRY_Pointer: /* Pointer */
diff --git a/common/phones/atbosch.c b/common/phones/atbosch.c
index a21aca6..c23884e 100644
--- a/common/phones/atbosch.c
+++ b/common/phones/atbosch.c
@@ -38,7 +38,7 @@ static gn_error Unsupported(gn_data *data, struct
gn_statemachine *state)
static at_recv_function_type replygetsms;
-/*
+/*
* Bosch 909 (and probably also Bosch 908) doesn't provide SMSC information
* We insert it here to satisfy generic PDU SMS receiving function in atgen.c
*/
diff --git a/common/phones/ateric.c b/common/phones/ateric.c
index e4f4bbf..5eefc4d 100644
--- a/common/phones/ateric.c
+++ b/common/phones/ateric.c
@@ -41,7 +41,7 @@ static gn_error GetMemoryStatus(gn_data *data, struct
gn_statemachine *state)
return sm_block_no_retry(GN_OP_GetMemoryStatus, data, state);
}
-/*
+/*
* Reminder: SonyEricsson doesn't return <used> and <total> values of memory
usage:
* > AT+CPBS?
* +CPBS: "ME"
diff --git a/common/phones/dc2711.c b/common/phones/dc2711.c
index a0bc63e..e5cf30d 100644
--- a/common/phones/dc2711.c
+++ b/common/phones/dc2711.c
@@ -58,7 +58,7 @@ static gn_error ReplyGetSMSStatus(int type, unsigned char
*buffer, int length,
/*
* FIXME: SMSs are not ready for text mode :-(
- *
+ *
* message looks like this one (stupid and lying advertisment by Eurotel):
* +CMGR: "REC READ","999102",,"02/12/20,10:17:57+40"<cr><lf>Prejeme Vam
vesele Vanoce a stastny novy rok 2003. I v pristim roce muzete ocekavat spoustu
zajimavych nabidek a prekvapeni od Go Clubu.<cr><lf>
*/
diff --git a/common/phones/gnapplet.c b/common/phones/gnapplet.c
index 86db63e..5be2117 100644
--- a/common/phones/gnapplet.c
+++ b/common/phones/gnapplet.c
@@ -235,7 +235,7 @@ static gn_error gnapplet_sms_pdu_decode(gn_sms_raw *rawsms,
const unsigned char
case GN_SMS_VP_RelativeFormat: l = 1; break;
default: l = 7; break;
}
- memcpy(rawsms->validity, pos, l);
+ memcpy(rawsms->validity, pos, l);
pos += l;
break;
case 13:/* TP-DT */
@@ -346,7 +346,7 @@ static gn_error gnapplet_sms_pdu_encode(unsigned char *buf,
int *len, const gn_s
case GN_SMS_VP_RelativeFormat: l = 1; break;
default: l = 7; break;
}
- memcpy(pos, rawsms->validity, l);
+ memcpy(pos, rawsms->validity, l);
pos += l;
break;
case 13:/* TP-DT */
diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index 2e3f5e6..a9086b8 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -3922,7 +3922,7 @@ static gn_error NK6510_WriteCalTodo_S40_30(gn_data *data,
struct gn_statemachine
req[41] = calnote->recurrence % 256;
/* Occurrences */
- /* FIXME: it doesn't work
+ /* FIXME: it doesn't work
if (calnote->recurrence) {
req[46] = calnote->occurrences / 256;
req[47] = calnote->occurrences % 256;
diff --git a/common/phones/pcsc.c b/common/phones/pcsc.c
index ed0e1f6..80a5b13 100644
--- a/common/phones/pcsc.c
+++ b/common/phones/pcsc.c
@@ -843,7 +843,7 @@ static gn_error DeleteSMSMessage(gn_data *data, struct
gn_statemachine *state)
int record_length;
gn_sms_raw *rs;
gn_error error;
-
+
if (!data || !data->raw_sms || !data->sms) {
return GN_ERR_INTERNALERROR;
}
@@ -856,26 +856,26 @@ static gn_error DeleteSMSMessage(gn_data *data, struct
gn_statemachine *state)
if (rs->number < 1 || rs->number > 255) {
return GN_ERR_INVALIDLOCATION;
}
-
+
dprintf("Erasing SMS storage number (%d/%d)\n", rs->memory_type,
rs->number);
ret = pcsc_change_dir(&IoStruct, GN_PCSC_FILE_DF_TELECOM);
error = get_gn_error(&IoStruct, ret);
if (error != GN_ERR_NONE) return error;
-
+
ret = pcsc_read_file_record(&IoStruct, file, rs->number);
error = get_gn_error(&IoStruct, ret);
if (error != GN_ERR_NONE) return error;
if (IoStruct.dwReceived < 178) return GN_ERR_INTERNALERROR;
-
+
/* do not check whether the record is already empty; this is
intentional to make it possible to wipe deleted records */
-
+
record_length = IoStruct.dwReceived - 2;
if (record_length > 255) return GN_ERR_INTERNALERROR;
buf[0] = 0x00;
memset(buf+1, 0xff, record_length-1);
ret = pcsc_update_file_record(&IoStruct, file, rs->number, buf,
record_length);
-
+
return get_gn_error(&IoStruct, ret);
}
@@ -1007,9 +1007,9 @@ static gn_error DeletePhonebook(gn_data *data, struct
gn_statemachine *state)
int record_length;
gn_phonebook_entry *pe;
gn_error error;
-
+
if (!data || !data->phonebook_entry) return GN_ERR_INTERNALERROR;
-
+
pe = data->phonebook_entry;
file = get_memory_type(pe->memory_type);
if (!file) {
@@ -1018,30 +1018,30 @@ static gn_error DeletePhonebook(gn_data *data, struct
gn_statemachine *state)
if (pe->location < 1 || pe->location > 255) {
return GN_ERR_INVALIDLOCATION;
}
-
+
dprintf("Erasing phonebook location (%d/%d)\n", pe->memory_type,
pe->location);
ret = pcsc_change_dir(&IoStruct, GN_PCSC_FILE_DF_TELECOM);
error = get_gn_error(&IoStruct, ret);
if (error != GN_ERR_NONE) return error;
-
+
ret = pcsc_read_file_record(&IoStruct, file, pe->location);
error = get_gn_error(&IoStruct, ret);
if (error != GN_ERR_NONE) return error;
if (IoStruct.dwReceived < 16) return GN_ERR_INTERNALERROR;
-
+
/* do not check whether the record is already empty; this is
intentional to make it possible to wipe deleted records */
-
+
if (IoStruct.pbRecvBuffer[IoStruct.dwReceived - 3] != 0xff) {
dprintf("Cannot erase a record with an extension field\n");
return GN_ERR_INTERNALERROR;
}
-
+
record_length = IoStruct.dwReceived - 2;
if (record_length > 255) return GN_ERR_INTERNALERROR;
memset(buf, 0xff, record_length);
ret = pcsc_update_file_record(&IoStruct, file, pe->location, buf,
record_length);
-
+
return get_gn_error(&IoStruct, ret);
}
@@ -1050,16 +1050,16 @@ static gn_error GetSecurityCodeStatus(gn_data *data,
struct gn_statemachine *sta
LONG ret;
gn_error error;
BYTE fchars, chv1st;
-
+
data->security_code->type = GN_SCT_None;
-
+
ret = pcsc_change_dir(&IoStruct, GN_PCSC_FILE_DF_TELECOM);
error = get_gn_error(&IoStruct, ret);
if (error != GN_ERR_NONE) return error;
ret = pcsc_stat_file(&IoStruct, GN_PCSC_FILE_DF_TELECOM);
error = get_gn_error(&IoStruct, ret);
if (error != GN_ERR_NONE) return error;
-
+
if (IoStruct.dwReceived < 22) return GN_ERR_INTERNALERROR;
fchars = IoStruct.pbRecvBuffer[13];
chv1st = IoStruct.pbRecvBuffer[18];
@@ -1080,17 +1080,17 @@ static gn_error GetSecurityCodeStatus(gn_data *data,
struct gn_statemachine *sta
return error;
}
}
-
+
return GN_ERR_NONE;
}
-
+
static gn_error EnterSecurityCode(gn_data *data, struct gn_statemachine *state)
{
LONG ret;
gn_error error;
BYTE chv_id;
size_t chv_len;
-
+
switch (data->security_code->type) {
case GN_SCT_Pin:
chv_id = 1;
@@ -1098,15 +1098,15 @@ static gn_error EnterSecurityCode(gn_data *data, struct
gn_statemachine *state)
default:
return GN_ERR_NOTIMPLEMENTED;
}
-
+
chv_len = strlen(data->security_code->code);
if (chv_len > 8)
return GN_ERR_INVALIDSECURITYCODE;
-
+
ret = pcsc_change_dir(&IoStruct, GN_PCSC_FILE_DF_TELECOM);
error = get_gn_error(&IoStruct, ret);
if (error != GN_ERR_NONE) return error;
-
+
ret = pcsc_verify_chv(&IoStruct, chv_id,
(BYTE *)data->security_code->code, chv_len);
error = get_gn_error(&IoStruct, ret);
@@ -1376,16 +1376,16 @@ static LONG pcsc_cmd_update_record(PCSC_IOSTRUCT *ios,
BYTE record, BYTE *data,
/* update a smart card "linear fixed file" contents from the provided buffer */
LONG ret = SCARD_S_SUCCESS;
BYTE pbSendBuffer[GN_PCSC_DATA_OFFSET + 256] = {
GN_PCSC_CMD_UPDATE_RECORD, 0x00, GN_PCSC_FILE_READ_ABS, 0x00 };
-
+
pbSendBuffer[GN_PCSC_PARAMETER_OFFSET_P1] = record;
/* pbSendBuffer[GN_PCSC_PARAMETER_OFFSET_P2] = GN_PCSC_FILE_READ_ABS;
*/ /* always
use absolute/current mode */
pbSendBuffer[GN_PCSC_PARAMETER_OFFSET_P3] = length;
memcpy(&pbSendBuffer[GN_PCSC_DATA_OFFSET], data, length);
ios->dwReceived = ios->dwRecvLength;
-
+
PCSC_TRANSMIT_WITH_LENGTH(ret, "cmd_update_record", pbSendBuffer,
GN_PCSC_DATA_OFFSET + length, ios);
-
+
return ret;
}
@@ -1393,17 +1393,17 @@ static LONG pcsc_update_file_record(PCSC_IOSTRUCT *ios,
LONG file_id, BYTE recor
{
/* copy contents of a record from the provided buffer to a file */
LONG ret;
-
+
ret = pcsc_stat_file(ios, file_id);
if (ret != SCARD_S_SUCCESS) return ret;
if (ios->dwReceived < 2) return SCARD_F_UNKNOWN_ERROR;
/* "soft" failure that needs to be catched by the caller */
if (ios->pbRecvBuffer[ios->dwReceived - 2] != 0x90) return
SCARD_S_SUCCESS;
-
+
/* records can only be updated in EFs */
if (ios->dwReceived <= 6) return SCARD_F_UNKNOWN_ERROR;
if (ios->pbRecvBuffer[6] != GN_PCSC_FILE_TYPE_EF) return
SCARD_E_INVALID_PARAMETER;
-
+
if (ios->dwReceived <= 13) return SCARD_F_UNKNOWN_ERROR;
switch (ios->pbRecvBuffer[13]) {
case GN_PCSC_FILE_STRUCTURE_CYCLIC:
@@ -1417,11 +1417,11 @@ static LONG pcsc_update_file_record(PCSC_IOSTRUCT *ios,
LONG file_id, BYTE recor
default:
ret = SCARD_E_INVALID_PARAMETER;
}
-
+
if (ret != SCARD_S_SUCCESS) {
dprintf("%s error %lX: %s\n", __FUNCTION__, ret,
pcsc_stringify_error(ret));
}
-
+
return ret;
}
@@ -1430,16 +1430,16 @@ static LONG pcsc_verify_chv(PCSC_IOSTRUCT *ios, BYTE
chv_id, BYTE *chv, BYTE chv
LONG ret = SCARD_S_SUCCESS;
BYTE pbSendBuffer[] = { GN_PCSC_CMD_VERIFY_CHV, 0x00, 0x00, 0x08,
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
};
-
+
if (chv_len > 8)
return SCARD_E_INVALID_PARAMETER;
-
+
pbSendBuffer[GN_PCSC_PARAMETER_OFFSET_P2] = chv_id;
memcpy(&pbSendBuffer[GN_PCSC_DATA_OFFSET], chv, chv_len);
ios->dwReceived = ios->dwRecvLength;
-
+
PCSC_TRANSMIT(ret, "cmd_verify_chv", pbSendBuffer, ios);
-
+
return ret;
}
diff --git a/common/readmidi.c b/common/readmidi.c
index 61b0dfc..c9ef71d 100644
--- a/common/readmidi.c
+++ b/common/readmidi.c
@@ -159,8 +159,8 @@ void midifile(struct MF *mf);
/*
* midifile 1.11
- *
- * Read and write a MIDI file. Externally-assigned function pointers are
+ *
+ * Read and write a MIDI file. Externally-assigned function pointers are
* called upon recognizing things in the file.
*
* Original release ?
@@ -178,7 +178,7 @@ void midifile(struct MF *mf);
* An in-depth description of the spec can also be found
* in the article "Introducing Standard MIDI Files", published
* in Electronic Musician magazine, April, 1989.
- *
+ *
*/
#include "config.h"
@@ -626,7 +626,7 @@ static void biggermsg(struct MF *mf)
* format 0 - Single multi-channel track
* 1 - Multiple simultaneous tracks
* 2 - One or more sequentially independent
- * single track patterns
+ * single track patterns
* ntracks The number of tracks in the file.
* division This is kind of tricky, it can represent two
* things, depending on whether it is positive or negative
@@ -645,7 +645,7 @@ static void biggermsg(struct MF *mf)
* Files 1.0 spec for more details.
* fp This should be the open file pointer to the file you
* want to write. It will have be a global in order
- * to work with Mf_putc.
+ * to work with Mf_putc.
*/
void mfwrite(struct MF *mf, int format, int ntracks, int division)
{
@@ -756,14 +756,14 @@ static void mf_write_header_chunk(struct MF *mf, int
format, int ntracks, int di
/*
* mf_write_midi_event()
- *
+ *
* Library routine to mf_write a single MIDI track event in the standard MIDI
* file format. The format is:
*
* <delta-time><event>
*
* In this case, event can be any multi-byte midi message, such as
- * "note on", "note off", etc.
+ * "note on", "note off", etc.
*
* delta_time - the time in ticks since the last event.
* type - the type of meta event.
@@ -922,7 +922,7 @@ unsigned long mf_sec2ticks(float secs, int division,
unsigned int tempo)
}
-/*
+/*
* This routine converts delta times in ticks into seconds. The
* else statement is needed because the formula is different for tracks
* based on notes and tracks based on SMPTE times.
diff --git a/common/snprintf.c b/common/snprintf.c
index ff4cfe9..b122280 100644
--- a/common/snprintf.c
+++ b/common/snprintf.c
@@ -35,9 +35,9 @@
* original. Also, there is now a builtin-test, just compile with:
* gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
* and run snprintf for results.
- *
+ *
* Thomas Roessler <address@hidden> 01/27/98 for mutt 0.89i
- * The PGP code was using unsigned hexadecimal formats.
+ * The PGP code was using unsigned hexadecimal formats.
* Unfortunately, unsigned formats simply didn't work.
*
* Michael Elkins <address@hidden> 03/05/98 for mutt 0.90.8
@@ -92,7 +92,7 @@
/* only include stdio.h if we are not re-defining snprintf or vsnprintf */
# include <stdio.h>
/* make the compiler happy with an empty file */
-void dummy_snprintf(void) {}
+void dummy_snprintf(void) {}
#else
#ifdef HAVE_LONG_DOUBLE
@@ -112,7 +112,7 @@ void dummy_snprintf(void) {}
#define SAFE_FREE(x) do { if ((x) != NULL) {free((x)); (x)=NULL;} } while(0)
#endif
-static size_t dopr(char *buffer, size_t maxlen, const char *format,
+static size_t dopr(char *buffer, size_t maxlen, const char *format,
va_list args);
static void fmtstr(char *buffer, size_t *currlen, size_t maxlen,
char *value, int flags, int min, int max);
@@ -175,14 +175,14 @@ static size_t dopr(char *buffer, size_t maxlen, const
char *format, va_list args
ch = *format++;
while (state != DP_S_DONE) {
- if (ch == '\0')
+ if (ch == '\0')
state = DP_S_DONE;
switch(state) {
case DP_S_DEFAULT:
- if (ch == '%')
+ if (ch == '%')
state = DP_S_FLAGS;
- else
+ else
dopr_outch (buffer, &currlen, maxlen, ch);
ch = *format++;
break;
@@ -229,7 +229,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char
*format, va_list args
if (ch == '.') {
state = DP_S_MAX;
ch = *format++;
- } else {
+ } else {
state = DP_S_MOD;
}
break;
@@ -274,7 +274,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char
*format, va_list args
switch (ch) {
case 'd':
case 'i':
- if (cflags == DP_C_SHORT)
+ if (cflags == DP_C_SHORT)
value = va_arg (args, int);
else if (cflags == DP_C_LONG)
value = va_arg (args, long int);
@@ -405,9 +405,9 @@ static size_t dopr(char *buffer, size_t maxlen, const char
*format, va_list args
}
}
if (maxlen != 0) {
- if (currlen < maxlen - 1)
+ if (currlen < maxlen - 1)
buffer[currlen] = '\0';
- else if (maxlen > 0)
+ else if (maxlen > 0)
buffer[maxlen - 1] = '\0';
}
@@ -429,9 +429,9 @@ static void fmtstr(char *buffer, size_t *currlen, size_t
maxlen,
for (strln = 0; value[strln]; ++strln); /* strlen */
padlen = min - strln;
- if (padlen < 0)
+ if (padlen < 0)
padlen = 0;
- if (flags & DP_F_MINUS)
+ if (flags & DP_F_MINUS)
padlen = -padlen; /* Left Justify */
while ((padlen > 0) && (cnt < max)) {
@@ -479,7 +479,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t
maxlen,
signvalue = ' ';
}
}
-
+
if (flags & DP_F_UP) caps = 1; /* Should characters be upper case? */
do {
@@ -499,7 +499,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t
maxlen,
zpadlen = MAX(zpadlen, spadlen);
spadlen = 0;
}
- if (flags & DP_F_MINUS)
+ if (flags & DP_F_MINUS)
spadlen = -spadlen; /* Left Justifty */
#ifdef DEBUG_SNPRINTF
@@ -514,7 +514,7 @@ static void fmtint(char *buffer, size_t *currlen, size_t
maxlen,
}
/* Sign */
- if (signvalue)
+ if (signvalue)
dopr_outch (buffer, currlen, maxlen, signvalue);
/* Zeros */
@@ -526,9 +526,9 @@ static void fmtint(char *buffer, size_t *currlen, size_t
maxlen,
}
/* Digits */
- while (place > 0)
+ while (place > 0)
dopr_outch (buffer, currlen, maxlen, convert[--place]);
-
+
/* Left Justified spaces */
while (spadlen < 0) {
dopr_outch (buffer, currlen, maxlen, ' ');
@@ -554,7 +554,7 @@ static LDOUBLE POW10(int exp)
result *= 10;
exp--;
}
-
+
return result;
}
@@ -598,7 +598,7 @@ static double my_modf(double x0, double *iptr)
ret = my_modf(x0-l*f, &i2);
(*iptr) = l*f + i2;
return ret;
- }
+ }
(*iptr) = l;
return x - (*iptr);
@@ -615,14 +615,14 @@ static void fmtfp (char *buffer, size_t *currlen, size_t
maxlen,
int iplace = 0;
int fplace = 0;
int padlen = 0; /* amount to pad */
- int zpadlen = 0;
+ int zpadlen = 0;
int caps = 0;
int index;
double intpart;
double fracpart;
double temp;
-
- /*
+
+ /*
* AIX manpage says the default is 0, but Solaris says the default
* is 6, and sprintf on AIX defaults to 6
*/
@@ -650,8 +650,8 @@ static void fmtfp (char *buffer, size_t *currlen, size_t
maxlen,
if (max == 0) ufvalue += 0.5; /* if max = 0 we must round */
#endif
- /*
- * Sorry, we only support 16 digits past the decimal because of our
+ /*
+ * Sorry, we only support 16 digits past the decimal because of our
* conversion method
*/
if (max > 16)
@@ -702,14 +702,14 @@ static void fmtfp (char *buffer, size_t *currlen, size_t
maxlen,
if (fplace == 311) fplace--;
}
fconvert[fplace] = 0;
-
+
/* -1 for decimal point, another -1 if we are printing a sign */
- padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0);
+ padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0);
zpadlen = max - fplace;
if (zpadlen < 0) zpadlen = 0;
- if (padlen < 0)
+ if (padlen < 0)
padlen = 0;
- if (flags & DP_F_MINUS)
+ if (flags & DP_F_MINUS)
padlen = -padlen; /* Left Justifty */
if ((flags & DP_F_ZERO) && (padlen > 0)) {
@@ -727,10 +727,10 @@ static void fmtfp (char *buffer, size_t *currlen, size_t
maxlen,
dopr_outch (buffer, currlen, maxlen, ' ');
--padlen;
}
- if (signvalue)
+ if (signvalue)
dopr_outch (buffer, currlen, maxlen, signvalue);
- while (iplace > 0)
+ while (iplace > 0)
dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]);
#ifdef DEBUG_SNPRINTF
@@ -744,7 +744,7 @@ static void fmtfp (char *buffer, size_t *currlen, size_t
maxlen,
if (max > 0) {
dopr_outch (buffer, currlen, maxlen, '.');
- while (fplace > 0)
+ while (fplace > 0)
dopr_outch (buffer, currlen, maxlen,
fconvert[--fplace]);
}
@@ -788,7 +788,7 @@ int snprintf(char *str,size_t count,const char *fmt,...)
{
size_t ret;
va_list ap;
-
+
va_start(ap, fmt);
ret = vsnprintf(str, count, fmt, ap);
va_end(ap);
@@ -799,7 +799,7 @@ int snprintf(char *str,size_t count,const char *fmt,...)
}
#endif
-#endif
+#endif
#ifndef HAVE_VASPRINTF
int vasprintf(char **ptr, const char *format, va_list ap)
@@ -873,7 +873,7 @@ int main (void)
"-16.16f",
NULL
};
- double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234,
0203.9, 0.96, 0.996,
+ double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234,
0203.9, 0.96, 0.996,
0.9996, 1.996, 4.136, 0};
char *int_fmt[] = {
"%-1.5d",
@@ -915,7 +915,7 @@ int main (void)
int l2 = snprintf(buf1, sizeof(buf1), fp_fmt[x],
fp_nums[y]);
sprintf (buf2, fp_fmt[x], fp_nums[y]);
if (strcmp (buf1, buf2)) {
- printf("snprintf doesn't match Format:
%s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
+ printf("snprintf doesn't match Format:
%s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
fp_fmt[x], buf1, buf2);
fail++;
}
@@ -933,7 +933,7 @@ int main (void)
int l2 = snprintf(buf1, sizeof(buf1), int_fmt[x],
int_nums[y]);
sprintf (buf2, int_fmt[x], int_nums[y]);
if (strcmp (buf1, buf2)) {
- printf("snprintf doesn't match Format:
%s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
+ printf("snprintf doesn't match Format:
%s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
int_fmt[x], buf1, buf2);
fail++;
}
@@ -951,7 +951,7 @@ int main (void)
int l2 = snprintf(buf1, sizeof(buf1), str_fmt[x],
str_vals[y]);
sprintf (buf2, str_fmt[x], str_vals[y]);
if (strcmp (buf1, buf2)) {
- printf("snprintf doesn't match Format:
%s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
+ printf("snprintf doesn't match Format:
%s\n\tsnprintf = [%s]\n\t sprintf = [%s]\n",
str_fmt[x], buf1, buf2);
fail++;
}
diff --git a/common/vcal.c b/common/vcal.c
index 76bc05e..8483bbb 100644
--- a/common/vcal.c
+++ b/common/vcal.c
@@ -280,75 +280,75 @@ norecurrence:
case GN_CALNOTE_REMINDER:
ical_append_printf(&str, "REMINDER\r\n");
break;
- case GN_CALNOTE_CALL:
+ case GN_CALNOTE_CALL:
ical_append_printf(&str, "PHONE CALL\r\n");
ical_append_printf(&str, "SUMMARY:%s\r\n",
calnote->phone_number);
ical_append_printf(&str, "DESCRIPTION:%s\r\n", calnote->text);
- break;
- case GN_CALNOTE_MEETING:
- ical_append_printf(&str, "MEETING\r\n");
+ break;
+ case GN_CALNOTE_MEETING:
+ ical_append_printf(&str, "MEETING\r\n");
if (calnote->mlocation[0])
ical_append_printf(&str, "LOCATION:%s\r\n",
calnote->mlocation);
- break;
- case GN_CALNOTE_BIRTHDAY:
- ical_append_printf(&str, "SPECIAL OCCASION\r\n");
- break;
- default:
- ical_append_printf(&str, "UNKNOWN\r\n");
- break;
- }
+ break;
+ case GN_CALNOTE_BIRTHDAY:
+ ical_append_printf(&str, "SPECIAL OCCASION\r\n");
+ break;
+ default:
+ ical_append_printf(&str, "UNKNOWN\r\n");
+ break;
+ }
if (calnote->type != GN_CALNOTE_CALL)
ical_append_printf(&str, "SUMMARY:%s\r\n", calnote->text);
ical_append_printf(&str, "DTSTART:%04d%02d%02dT%02d%02d%02d\r\n",
calnote->time.year,
- calnote->time.month, calnote->time.day, calnote->time.hour,
- calnote->time.minute, calnote->time.second);
+ calnote->time.month, calnote->time.day, calnote->time.hour,
+ calnote->time.minute, calnote->time.second);
if (calnote->end_time.year) {
- ical_append_printf(&str, "DTEND:%04d%02d%02dT%02d%02d%02d\r\n",
calnote->end_time.year,
- calnote->end_time.month, calnote->end_time.day,
calnote->end_time.hour,
- calnote->end_time.minute, calnote->end_time.second);
+ ical_append_printf(&str, "DTEND:%04d%02d%02dT%02d%02d%02d\r\n",
calnote->end_time.year,
+ calnote->end_time.month, calnote->end_time.day,
calnote->end_time.hour,
+ calnote->end_time.minute, calnote->end_time.second);
}
if (calnote->alarm.enabled) {
ical_append_printf(&str,
"%sALARM:%04d%02d%02dT%02d%02d%02d\r\n",
(calnote->alarm.tone ? "A" : "D"),
- calnote->alarm.timestamp.year,
- calnote->alarm.timestamp.month, calnote->alarm.timestamp.day,
calnote->alarm.timestamp.hour,
- calnote->alarm.timestamp.minute,
calnote->alarm.timestamp.second);
- }
- switch (calnote->recurrence) {
- case GN_CALNOTE_NEVER:
- break;
- case GN_CALNOTE_DAILY:
+ calnote->alarm.timestamp.year,
+ calnote->alarm.timestamp.month, calnote->alarm.timestamp.day,
calnote->alarm.timestamp.hour,
+ calnote->alarm.timestamp.minute,
calnote->alarm.timestamp.second);
+ }
+ switch (calnote->recurrence) {
+ case GN_CALNOTE_NEVER:
+ break;
+ case GN_CALNOTE_DAILY:
calnote->occurrences ?
ical_append_printf(&str, "RRULE:FREQ=DAILY\r\n") :
ical_append_printf(&str,
"RRULE:FREQ=DAILY;COUNT=%d\r\n", calnote->occurrences);
- break;
- case GN_CALNOTE_WEEKLY:
+ break;
+ case GN_CALNOTE_WEEKLY:
calnote->occurrences ?
ical_append_printf(&str, "RRULE:FREQ=WEEKLY\r\n") :
ical_append_printf(&str,
"RRULE:FREQ=WEEKLY;COUNT=%d\r\n", calnote->occurrences);
- break;
- case GN_CALNOTE_2WEEKLY:
+ break;
+ case GN_CALNOTE_2WEEKLY:
calnote->occurrences ?
ical_append_printf(&str,
"RRULE:FREQ=WEEKLY;INTERVAL=2\r\n") :
ical_append_printf(&str,
"RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=%d\r\n", calnote->occurrences);
- break;
- case GN_CALNOTE_MONTHLY:
+ break;
+ case GN_CALNOTE_MONTHLY:
calnote->occurrences ?
ical_append_printf(&str, "RRULE:FREQ=MONTHLY\r\n") :
ical_append_printf(&str,
"RRULE:FREQ=MONTHLY;COUNT=%d\r\n", calnote->occurrences);
- break;
- case GN_CALNOTE_YEARLY:
+ break;
+ case GN_CALNOTE_YEARLY:
calnote->occurrences ?
ical_append_printf(&str, "RRULE:FREQ=YEARLY\r\n") :
ical_append_printf(&str,
"RRULE:FREQ=YEARLY;COUNT=%d\r\n", calnote->occurrences);
- break;
- default:
+ break;
+ default:
calnote->occurrences ?
ical_append_printf(&str,
"RRULE:FREQ=HOURLY;INTERVAL=%d\r\n", calnote->recurrence) :
ical_append_printf(&str,
"RRULE:FREQ=HOURLY;INTERVAL=%d;COUNT=%d\r\n", calnote->recurrence,
calnote->occurrences);
- break;
- }
- ical_append_printf(&str, "END:VEVENT\r\n");
+ break;
+ }
+ ical_append_printf(&str, "END:VEVENT\r\n");
ical_append_printf(&str, "END:VCALENDAR\r\n");
return str.str;
#endif /* HAVE_LIBICAL */
@@ -673,11 +673,11 @@ GNOKII_API char * gn_todo2icalstr(gn_todo *ctodo)
memset(&str, 0, sizeof(str));
ical_append_printf(&str, "BEGIN:VCALENDAR\r\n");
- ical_append_printf(&str, "VERSION:1.0\r\n");
- ical_append_printf(&str, "BEGIN:VTODO\r\n");
- ical_append_printf(&str, "PRIORITY:%i\r\n", ctodo->priority);
- ical_append_printf(&str, "SUMMARY:%s\r\n", ctodo->text);
- ical_append_printf(&str, "END:VTODO\r\n");
+ ical_append_printf(&str, "VERSION:1.0\r\n");
+ ical_append_printf(&str, "BEGIN:VTODO\r\n");
+ ical_append_printf(&str, "PRIORITY:%i\r\n", ctodo->priority);
+ ical_append_printf(&str, "SUMMARY:%s\r\n", ctodo->text);
+ ical_append_printf(&str, "END:VTODO\r\n");
ical_append_printf(&str, "END:VCALENDAR\r\n");
return str.str;
diff --git a/include/compat.h b/include/compat.h
index f1766d8..529a797 100644
--- a/include/compat.h
+++ b/include/compat.h
@@ -105,11 +105,11 @@
/*
* The following ifdef block is the standard way of creating macros which make
- * exporting from a DLL simpler. All files within this DLL are compiled with
+ * exporting from a DLL simpler. All files within this DLL are compiled with
* the GNOKIIDLL_EXPORTS symbol defined on the command line. this symbol should
* not be defined on any project that uses this DLL. This way any other project
- * whose source files include this file see API functions as being imported
- * from a DLL, wheras this DLL sees symbols defined with this macro as being
+ * whose source files include this file see API functions as being imported
+ * from a DLL, wheras this DLL sees symbols defined with this macro as being
* exported.
*/
#if defined(WIN32)
diff --git a/include/devices/dku2libusb.h b/include/devices/dku2libusb.h
index 71b0483..be4d4ba 100644
--- a/include/devices/dku2libusb.h
+++ b/include/devices/dku2libusb.h
@@ -34,8 +34,8 @@ struct fbus_usb_interface_transport {
int configuration_description; /* Configuration string
descriptor number */
int control_interface; /* DKU2 FBUS master interface */
int control_setting; /* DKU2 FBUS master interface
setting */
- int control_interface_description; /* DKU2 FBUS master interface
string descriptor number
- * If non-zero, use
usb_get_string_simple() from
+ int control_interface_description; /* DKU2 FBUS master interface
string descriptor number
+ * If non-zero, use
usb_get_string_simple() from
* libusb to retrieve
human-readable description
*/
int data_interface; /* DKU2 FBUS data/slave
interface */
diff --git a/include/gnokii/common.h b/include/gnokii/common.h
index fa4f5fa..75eaeb0 100644
--- a/include/gnokii/common.h
+++ b/include/gnokii/common.h
@@ -154,7 +154,7 @@ typedef struct {
* - Position
* - Aliasname
* - DTMF
- * - User ID
+ * - User ID
* - all postal fields:
* - PO Box
* - Addition
@@ -249,7 +249,7 @@ typedef enum {
GN_PHONEBOOK_GROUP_Vips,
GN_PHONEBOOK_GROUP_Friends,
GN_PHONEBOOK_GROUP_Work,
- GN_PHONEBOOK_GROUP_Others,
+ GN_PHONEBOOK_GROUP_Others,
GN_PHONEBOOK_GROUP_None,
} gn_phonebook_group_type;
diff --git a/include/gnokii/data.h b/include/gnokii/data.h
index c94b5d2..91f0eda 100644
--- a/include/gnokii/data.h
+++ b/include/gnokii/data.h
@@ -110,7 +110,7 @@ typedef struct {
gn_mms *mms;
} gn_data;
-/*
+/*
* A structure to hold information about the particular link
* The link comes 'under' the phone
*/
diff --git a/include/gnokii/encoding.h b/include/gnokii/encoding.h
index 59b74e5..d967bd3 100644
--- a/include/gnokii/encoding.h
+++ b/include/gnokii/encoding.h
@@ -28,7 +28,7 @@ GNOKII_API int gn_char_def_alphabet(unsigned char *string);
* LANG variable. This function can be used to override this behaviour. E.g.,
* to make Gnokii always interpret and return string values using the UTF-8
* charset, call gn_set_encoding("UTF-8").
- *
+ *
* This has nothing to do with the encoding used to communicate with the
* phone itself, which is a totally different issue.
*
diff --git a/include/gnokii/error.h b/include/gnokii/error.h
index d52440a..9caac9d 100644
--- a/include/gnokii/error.h
+++ b/include/gnokii/error.h
@@ -16,9 +16,9 @@
#ifndef _gnokii_error_h
#define _gnokii_error_h
-/*
+/*
* Define standard GSM error/return code values. These codes are also used for
- * some internal functions such as SIM read/write in the model specific code.
+ * some internal functions such as SIM read/write in the model specific code.
*/
typedef enum {
/* General codes */
diff --git a/include/gnokii/mms.h b/include/gnokii/mms.h
index d40c1aa..33cdecb 100644
--- a/include/gnokii/mms.h
+++ b/include/gnokii/mms.h
@@ -42,7 +42,7 @@ typedef enum {
/*
* Content-Type
- *
+ *
* WAP-209-MMSEncapsulation-20020105-a - Chapter 7.2.4. "Content-Type field"
* WAP-230-WSP-20010705-a Appendix A, Table 40 refers to
http://www.wapforum.org/wina
* See http://www.wapforum.org/wina/wsp-content-type.htm for full list
diff --git a/include/gnokii/sms.h b/include/gnokii/sms.h
index 15d7e81..9534a6b 100644
--- a/include/gnokii/sms.h
+++ b/include/gnokii/sms.h
@@ -160,7 +160,7 @@ typedef struct {
gn_sms_dcs_type type;
union {
struct {
- /* Message class:
+ /* Message class:
* 0 - no class
* 1 - Class 0
* 2 - Class 1
@@ -500,7 +500,7 @@ typedef struct {
char *url;
char *text;
char *data;
- int data_len;
+ int data_len;
} gn_wap_push;
GNOKII_API void gn_wap_push_init(gn_wap_push *wp);
diff --git a/include/gnokii/wappush.h b/include/gnokii/wappush.h
index 6c2645d..fe0bf94 100644
--- a/include/gnokii/wappush.h
+++ b/include/gnokii/wappush.h
@@ -8,8 +8,8 @@
Copyright (C) 2006 Igor Popik
- Include file for the binary SMS push functions.
-
+ Include file for the binary SMS push functions.
+
Based on wapforum document WAP-167-ServiceInd-20010731-a
*/
diff --git a/include/links/atbus.h b/include/links/atbus.h
index 8de730f..d28c904 100644
--- a/include/links/atbus.h
+++ b/include/links/atbus.h
@@ -9,7 +9,7 @@
Copyright (C) 1999-2000 Hugh Blemings, Pavel Janik
Copyright (C) 2001 Manfred Jonsson <address@hidden>
Copyright (C) 2002 Ladis Michl
-
+
*/
#ifndef _gnokii_atbus_h
@@ -19,9 +19,9 @@
gn_error atbus_initialise(int mode, struct gn_statemachine *state);
-/*
+/*
* Define some result/error codes internal to the AT command functions.
- * Also define a code for an unterminated message.
+ * Also define a code for an unterminated message.
*/
typedef enum {
GN_AT_NONE, /* NO or unknown result code */
@@ -36,7 +36,7 @@ typedef enum {
typedef struct {
/* The buffer for phone responses not only holds the data from the
- * phone but also a byte which holds the compiled status of the
+ * phone but also a byte which holds the compiled status of the
* response. it is placed at [0]. */
char *rbuf;
int rbuf_size;
diff --git a/include/nokia-decoding.h b/include/nokia-decoding.h
index 8c9cb5a..26a98ee 100644
--- a/include/nokia-decoding.h
+++ b/include/nokia-decoding.h
@@ -8,7 +8,7 @@
Copyright (C) 2002 Markus Plail
- This file provides decoding functions specific to the newer
+ This file provides decoding functions specific to the newer
Nokia 7110/6510 series.
*/
-----------------------------------------------------------------------
Summary of changes:
common/cfgreader.c | 4 +-
common/compat.c | 2 +-
common/data/virtmodem.c | 2 +-
common/devices/dku2libusb.c | 38 +++++++++---------
common/devices/unixbluetooth.c | 4 +-
common/devices/unixserial.c | 2 +-
common/gsm-api.c | 8 ++--
common/gsm-auth.c | 2 +-
common/gsm-bitmaps.c | 2 +-
common/gsm-common.c | 4 +-
common/gsm-encoding.c | 4 +-
common/gsm-networks.c | 2 +-
common/gsm-ringtones.c | 2 +-
common/gsm-sms.c | 4 +-
common/ldif.c | 2 +-
common/libfunctions.c | 4 +-
common/links/atbus.c | 8 ++--
common/links/cbus.c | 4 +-
common/links/fbus-3110.c | 22 +++++-----
common/links/fbus.c | 6 +-
common/nokia-decoding.c | 6 +-
common/phones/atbosch.c | 2 +-
common/phones/ateric.c | 2 +-
common/phones/dc2711.c | 2 +-
common/phones/gnapplet.c | 4 +-
common/phones/nk6510.c | 2 +-
common/phones/pcsc.c | 70 ++++++++++++++++----------------
common/readmidi.c | 16 ++++----
common/snprintf.c | 76 +++++++++++++++++-----------------
common/vcal.c | 86 ++++++++++++++++++++--------------------
include/compat.h | 6 +-
include/devices/dku2libusb.h | 4 +-
include/gnokii/common.h | 4 +-
include/gnokii/data.h | 2 +-
include/gnokii/encoding.h | 2 +-
include/gnokii/error.h | 4 +-
include/gnokii/mms.h | 2 +-
include/gnokii/sms.h | 4 +-
include/gnokii/wappush.h | 4 +-
include/links/atbus.h | 8 ++--
include/nokia-decoding.h | 2 +-
41 files changed, 217 insertions(+), 217 deletions(-)
hooks/post-receive
--
libgnokii and core programs
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-538-g3f04ca7,
Daniele Forsi <=