[maemo-commits] [maemo-commits] r14702 - projects/connectivity/osso-gwobex/trunk/src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Nov 2 09:11:43 EET 2007
- Previous message: [maemo-commits] r14701 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r14703 - in projects/connectivity/osso-gwobex/trunk: . debian src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jh
Date: 2007-11-02 09:11:40 +0200 (Fri, 02 Nov 2007)
New Revision: 14702
Modified:
projects/connectivity/osso-gwobex/trunk/src/gw-obex.c
projects/connectivity/osso-gwobex/trunk/src/gw-obex.h
projects/connectivity/osso-gwobex/trunk/src/log.h
projects/connectivity/osso-gwobex/trunk/src/obex-priv.c
projects/connectivity/osso-gwobex/trunk/src/obex-priv.h
projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c
projects/connectivity/osso-gwobex/trunk/src/obex-xfer.h
projects/connectivity/osso-gwobex/trunk/src/utils.c
projects/connectivity/osso-gwobex/trunk/src/utils.h
Log:
White-space cleanup
Modified: projects/connectivity/osso-gwobex/trunk/src/gw-obex.c
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/gw-obex.c 2007-11-01 17:08:24 UTC (rev 14701)
+++ projects/connectivity/osso-gwobex/trunk/src/gw-obex.c 2007-11-02 07:11:40 UTC (rev 14702)
@@ -8,7 +8,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License, version 2.1, as published by the Free Software Foundation.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -117,7 +117,7 @@
const gchar *type,
const gchar *buf,
gint buf_size,
- gint time,
+ gint time,
gint *error) {
gboolean ret;
GW_OBEX_LOCK(ctx);
@@ -321,7 +321,7 @@
*error = GW_OBEX_ERROR_NO_SERVICE;
return NULL;
}
-
+
debug("Connected (Connection ID: %#x)\n", ctx->conid);
ctx->gio = g_io_channel_unix_new(ctx->conn_fd);
Modified: projects/connectivity/osso-gwobex/trunk/src/gw-obex.h
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/gw-obex.h 2007-11-01 17:08:24 UTC (rev 14701)
+++ projects/connectivity/osso-gwobex/trunk/src/gw-obex.h 2007-11-02 07:11:40 UTC (rev 14702)
@@ -10,7 +10,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License, version 2.1, as published by the Free Software Foundation.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -113,7 +113,7 @@
* @param ctx GwObex pointer for the connection
* @param obex_cmd eg. OBEX_CMD_PUT
* @param current Bytes transfered
- * @param target Total length (or GW_OBEX_UNKNOWN_LENGTH)
+ * @param target Total length (or GW_OBEX_UNKNOWN_LENGTH)
* @param data Optional pointer to user data
*/
typedef void (*gw_obex_progress_cb_t) (GwObex *ctx, gint obex_cmd,
@@ -316,7 +316,7 @@
/** Read data from a file descriptor and send it to the remote device
*
* @param ctx Pointer returned by gw_obex_setup()
- * @param fd File descriptor to read the data from
+ * @param fd File descriptor to read the data from
* @param remote Remote filename (null terminated UTF-8)
* @param type MIME-type of the object
* @param error Place to store error code on failure
@@ -377,7 +377,7 @@
gboolean gw_obex_chdir(GwObex *ctx, const gchar *dir, gint *error);
-/** Create a new directory.
+/** Create a new directory.
*
* @param ctx Pointer returned by gw_obex_setup()
* @param dir Directory to create (null terminated UTF-8)
Modified: projects/connectivity/osso-gwobex/trunk/src/log.h
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/log.h 2007-11-01 17:08:24 UTC (rev 14701)
+++ projects/connectivity/osso-gwobex/trunk/src/log.h 2007-11-02 07:11:40 UTC (rev 14702)
@@ -8,7 +8,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License, version 2.1, as published by the Free Software Foundation.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Modified: projects/connectivity/osso-gwobex/trunk/src/obex-priv.c
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/obex-priv.c 2007-11-01 17:08:24 UTC (rev 14701)
+++ projects/connectivity/osso-gwobex/trunk/src/obex-priv.c 2007-11-02 07:11:40 UTC (rev 14702)
@@ -1,6 +1,6 @@
/**
@file obex-priv.c
-
+
Private functions for the GW OBEX Library
@author Johan Hedberg <johan.hedberg at nokia.com>
@@ -10,7 +10,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License, version 2.1, as published by the Free Software Foundation.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -126,7 +126,7 @@
obex_link_error(ctx);
return FALSE;
}
-
+
debug("gw_obex_request_sync(): looping\n");
}
@@ -357,7 +357,7 @@
&xfer->target_size, &xfer->modtime);
show_headers(ctx->handle, object);
}
-
+
actual = OBEX_ObjectReadStream(ctx->handle, object, &buf);
if (actual > 0) {
xfer->counter += actual;
@@ -714,7 +714,7 @@
if (!ctx->done || ctx->xfer) {
ctx->error = GW_OBEX_ERROR_BUSY;
return FALSE;
- }
+ }
ctx->obex_op = OBEX_CMD_ACTION;
@@ -758,13 +758,13 @@
obex_headerdata_t hv;
obex_object_t *object;
obex_setpath_hdr_t nonhdrdata;
- gunichar2 *uname;
+ gunichar2 *uname;
glong uname_len;
if (!ctx->done || ctx->xfer) {
ctx->error = GW_OBEX_ERROR_BUSY;
return FALSE;
- }
+ }
ctx->obex_op = OBEX_CMD_SETPATH;
@@ -803,7 +803,7 @@
}
ret = gw_obex_request_sync(ctx, object);
-
+
out:
ctx->obex_op = OBEX_CMD_NONE;
return ret;
@@ -823,7 +823,7 @@
if (!ctx->done || ctx->xfer) {
ctx->error = GW_OBEX_ERROR_BUSY;
return ret;
- }
+ }
ctx->obex_op = OBEX_CMD_GET;
@@ -981,7 +981,7 @@
object = OBEX_ObjectNew(ctx->handle, OBEX_CMD_PUT);
- if (ctx->conid != CONID_INVALID) {
+ if (ctx->conid != CONID_INVALID) {
hv.bq4 = ctx->conid;
OBEX_ObjectAddHeader(ctx->handle, object, OBEX_HDR_CONNECTION, hv, 4, 0);
}
@@ -1030,7 +1030,7 @@
OBEX_ObjectAddHeader(ctx->handle, object, OBEX_HDR_LENGTH, hv, 4, 0);
}
else
- ctx->xfer->target_size = GW_OBEX_UNKNOWN_LENGTH;
+ ctx->xfer->target_size = GW_OBEX_UNKNOWN_LENGTH;
if (ctx->xfer->stream_fd >= 0 || buf || async) {
hv.bs = NULL;
Modified: projects/connectivity/osso-gwobex/trunk/src/obex-priv.h
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/obex-priv.h 2007-11-01 17:08:24 UTC (rev 14701)
+++ projects/connectivity/osso-gwobex/trunk/src/obex-priv.h 2007-11-02 07:11:40 UTC (rev 14702)
@@ -8,7 +8,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License, version 2.1, as published by the Free Software Foundation.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -130,7 +130,7 @@
/* For checking if the current operation is finished */
gboolean done;
-
+
/* TRUE if a link error has hapened */
gboolean link_err;
Modified: projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c 2007-11-01 17:08:24 UTC (rev 14701)
+++ projects/connectivity/osso-gwobex/trunk/src/obex-xfer.c 2007-11-02 07:11:40 UTC (rev 14702)
@@ -1,6 +1,6 @@
/**
@file obex-xfer.c
-
+
Object transfer related functions for the GW OBEX Library
@author Johan Hedberg <johan.hedberg at nokia.com>
@@ -10,7 +10,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License, version 2.1 as published by the Free Software Foundation.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -259,7 +259,7 @@
(void) g_source_attach(xfer->idle_source, ctx->main_ctx);
g_source_unref(xfer->idle_source);
}
-
+
GW_OBEX_UNLOCK(ctx);
if (ret)
debug("gw_obex_xfer_write(): returning, %d bytes written\n", *bytes_written);
Modified: projects/connectivity/osso-gwobex/trunk/src/obex-xfer.h
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/obex-xfer.h 2007-11-01 17:08:24 UTC (rev 14701)
+++ projects/connectivity/osso-gwobex/trunk/src/obex-xfer.h 2007-11-02 07:11:40 UTC (rev 14702)
@@ -8,7 +8,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License, version 2.1, as published by the Free Software Foundation.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Modified: projects/connectivity/osso-gwobex/trunk/src/utils.c
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/utils.c 2007-11-01 17:08:24 UTC (rev 14701)
+++ projects/connectivity/osso-gwobex/trunk/src/utils.c 2007-11-02 07:11:40 UTC (rev 14702)
@@ -8,7 +8,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License, version 2.1, as published by the Free Software Foundation.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@@ -160,7 +160,7 @@
if (nr < 6) {
/* Invalid time format */
return -1;
- }
+ }
time = mktime (&tm);
Modified: projects/connectivity/osso-gwobex/trunk/src/utils.h
===================================================================
--- projects/connectivity/osso-gwobex/trunk/src/utils.h 2007-11-01 17:08:24 UTC (rev 14701)
+++ projects/connectivity/osso-gwobex/trunk/src/utils.h 2007-11-02 07:11:40 UTC (rev 14702)
@@ -8,7 +8,7 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License, version 2.1, as published by the Free Software Foundation.
-
+
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Previous message: [maemo-commits] r14701 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r14703 - in projects/connectivity/osso-gwobex/trunk: . debian src
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]