[Nice] [nice/master] fix some trailing spaces
Youness Alaoui
youness.alaoui at collabora.co.uk
Wed Nov 5 14:00:58 PST 2008
darcs-hash:20080422162808-4f0f6-84a59e52bc8309765d32b543b6596b70216d09f1.gz
---
agent/agent.c | 10 +++++-----
agent/agent.h | 5 +++--
agent/candidate.c | 10 +++++-----
agent/conncheck.h | 2 +-
agent/stream.c | 6 +++---
agent/stream.h | 1 +
6 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/agent/agent.c b/agent/agent.c
index 325c86f..0c1f818 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -77,7 +77,7 @@ enum
PROP_COMPATIBILITY,
PROP_STUN_SERVER,
PROP_STUN_SERVER_PORT,
- PROP_TURN_SERVER,
+ PROP_TURN_SERVER,
PROP_TURN_SERVER_PORT,
PROP_CONTROLLING_MODE,
PROP_FULL_MODE,
@@ -177,7 +177,7 @@ nice_agent_class_init (NiceAgentClass *klass)
gobject_class->dispose = nice_agent_dispose;
/* install properties */
-
+
g_object_class_install_property (gobject_class, PROP_SOCKET_FACTORY,
g_param_spec_pointer (
"socket-factory",
@@ -1683,7 +1683,7 @@ nice_agent_g_source_cb (
/* note: dear compiler, these are for you: */
(void)source;
- len = _nice_agent_recv (agent, stream, component, ctx->socket,
+ len = _nice_agent_recv (agent, stream, component, ctx->socket,
MAX_STUN_DATAGRAM_PAYLOAD, buf);
if (len > 0)
@@ -1790,10 +1790,10 @@ nice_agent_attach_recv (
* Sets the selected candidate pair for media transmission
* for given stream component. Calling this function will
* disable all further ICE processing (connection check,
- * state machine updates, etc). Note that keepalives will
+ * state machine updates, etc). Note that keepalives will
* continue to be sent.
*/
-NICEAPI_EXPORT gboolean
+NICEAPI_EXPORT gboolean
nice_agent_set_selected_pair (
NiceAgent *agent,
guint stream_id,
diff --git a/agent/agent.h b/agent/agent.h
index 72a14b1..58ecb98 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -85,9 +85,9 @@ typedef enum
NICE_COMPONENT_STATE_CONNECTED, /* at least one working candidate pair */
NICE_COMPONENT_STATE_READY, /* ICE concluded, candidate pair
selection is now final */
- NICE_COMPONENT_STATE_FAILED, /* connectivity checks have been completed,
+ NICE_COMPONENT_STATE_FAILED, /* connectivity checks have been completed,
but connectivity was not established */
- NICE_COMPONENT_STATE_LAST
+ NICE_COMPONENT_STATE_LAST
} NiceComponentState;
typedef enum
@@ -129,6 +129,7 @@ struct _NiceAgentClass
GObjectClass parent_class;
};
+
GType nice_agent_get_type (void);
NiceAgent *
diff --git a/agent/candidate.c b/agent/candidate.c
index 4e180c8..4ebd866 100644
--- a/agent/candidate.c
+++ b/agent/candidate.c
@@ -139,13 +139,13 @@ nice_candidate_ice_priority (const NiceCandidate *candidate)
switch (candidate->type)
{
- case NICE_CANDIDATE_TYPE_HOST:
+ case NICE_CANDIDATE_TYPE_HOST:
type_preference = NICE_CANDIDATE_TYPE_PREF_HOST; break;
- case NICE_CANDIDATE_TYPE_PEER_REFLEXIVE:
+ case NICE_CANDIDATE_TYPE_PEER_REFLEXIVE:
type_preference = NICE_CANDIDATE_TYPE_PREF_PEER_REFLEXIVE; break;
case NICE_CANDIDATE_TYPE_SERVER_REFLEXIVE:
type_preference = NICE_CANDIDATE_TYPE_PREF_SERVER_REFLEXIVE; break;
- case NICE_CANDIDATE_TYPE_RELAYED:
+ case NICE_CANDIDATE_TYPE_RELAYED:
type_preference = NICE_CANDIDATE_TYPE_PREF_RELAYED; break;
}
@@ -153,8 +153,8 @@ nice_candidate_ice_priority (const NiceCandidate *candidate)
return nice_candidate_ice_priority_full (type_preference, 1, candidate->component_id);
}
-/**
- * Calculates the pair priority as specified in ICE
+/**
+ * Calculates the pair priority as specified in ICE
* sect 5.7.2. "Computing Pair Priority and Ordering Pairs" (ID-19).
*/
NICEAPI_EXPORT guint64
diff --git a/agent/conncheck.h b/agent/conncheck.h
index 0ea98f0..b0b39eb 100644
--- a/agent/conncheck.h
+++ b/agent/conncheck.h
@@ -71,7 +71,7 @@ struct _CandidateCheckPair
NiceCheckState state;
gboolean nominated;
gboolean controlling;
- guint64 priority;
+ guint64 priority;
GTimeVal next_tick; /* next tick timestamp */
gboolean traffic_after_tick;
stun_bind_t *stun_ctx;
diff --git a/agent/stream.c b/agent/stream.c
index 4bd750c..5342a7c 100644
--- a/agent/stream.c
+++ b/agent/stream.c
@@ -104,7 +104,7 @@ stream_find_component_by_id (const Stream *stream, guint id)
if (component && component->id == id)
return component;
}
-
+
return NULL;
}
@@ -124,7 +124,7 @@ stream_all_components_ready (const Stream *stream)
component->state == NICE_COMPONENT_STATE_READY))
return FALSE;
}
-
+
return TRUE;
}
@@ -142,7 +142,7 @@ stream_find_component_by_fd (const Stream *stream, guint fd)
for (i = stream->components; i; i = i->next) {
Component *component = i->data;
- NiceUDPSocket *socket =
+ NiceUDPSocket *socket =
component_find_udp_socket_by_fd (component, fd);
if (socket)
return component;
diff --git a/agent/stream.h b/agent/stream.h
index 96a9c9b..c72bc94 100644
--- a/agent/stream.h
+++ b/agent/stream.h
@@ -66,6 +66,7 @@ typedef enum
NICE_CHECKLIST_FAILED
} NiceCheckListState;
+
typedef struct _Stream Stream;
struct _Stream
--
1.5.6.5
More information about the Nice
mailing list