summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/curl/gstcurlbasesink.c4
-rw-r--r--ext/curl/gstcurlbasesink.h2
-rw-r--r--ext/curl/gstcurlfilesink.c3
-rw-r--r--ext/curl/gstcurlftpsink.c3
-rw-r--r--ext/curl/gstcurlftpsink.h2
-rw-r--r--ext/curl/gstcurlsftpsink.h5
-rw-r--r--ext/curl/gstcurlsmtpsink.c13
-rw-r--r--ext/curl/gstcurlsshsink.h40
-rw-r--r--ext/curl/gstcurltlssink.c6
9 files changed, 39 insertions, 39 deletions
diff --git a/ext/curl/gstcurlbasesink.c b/ext/curl/gstcurlbasesink.c
index 1ce3ecccb..6b088bfb2 100644
--- a/ext/curl/gstcurlbasesink.c
+++ b/ext/curl/gstcurlbasesink.c
@@ -1012,8 +1012,8 @@ gst_curl_base_sink_transfer_thread_func (gpointer data)
/* Start driving the transfer. */
klass->handle_transfer (sink);
- /* easy handle will be possibly re-used for next transfer, thus it needs to
- * be removed from the multi stack and re-added again */
+ /* easy handle will be possibly re-used for next transfer, thus it needs
+ * to be removed from the multi stack and re-added again */
if (!gst_curl_base_sink_is_live (sink)) {
curl_multi_remove_handle (sink->multi_handle, sink->curl);
}
diff --git a/ext/curl/gstcurlbasesink.h b/ext/curl/gstcurlbasesink.h
index 3def1ba79..ce5214243 100644
--- a/ext/curl/gstcurlbasesink.h
+++ b/ext/curl/gstcurlbasesink.h
@@ -102,7 +102,7 @@ struct _GstCurlBaseSinkClass
size_t block_size, guint * last_chunk);
size_t (*flush_data_unlocked) (GstCurlBaseSink * sink, void *curl_ptr,
size_t block_size, gboolean new_file, gboolean close_transfer);
- gboolean (*has_buffered_data_unlocked) (GstCurlBaseSink * sink);
+ gboolean (*has_buffered_data_unlocked) (GstCurlBaseSink * sink);
};
GType gst_curl_base_sink_get_type (void);
diff --git a/ext/curl/gstcurlfilesink.c b/ext/curl/gstcurlfilesink.c
index 4b26ab5fc..a39a000ad 100644
--- a/ext/curl/gstcurlfilesink.c
+++ b/ext/curl/gstcurlfilesink.c
@@ -26,7 +26,8 @@
* a local or network drive.
*
* <refsect2>
- * <title>Example launch line (upload a JPEG file to /home/test/images directory)</title>
+ * <title>Example launch line (upload a JPEG file to /home/test/images
+ * directory)</title>
* |[
* gst-launch filesrc location=image.jpg ! jpegparse ! curlfilesink \
* file-name=image.jpg \
diff --git a/ext/curl/gstcurlftpsink.c b/ext/curl/gstcurlftpsink.c
index 493bc6c99..bb1e9cb51 100644
--- a/ext/curl/gstcurlftpsink.c
+++ b/ext/curl/gstcurlftpsink.c
@@ -26,7 +26,8 @@
* an FTP server.
*
* <refsect2>
- * <title>Example launch line (upload a JPEG file to /home/test/images directory)</title>
+ * <title>Example launch line (upload a JPEG file to /home/test/images
+ * directory)</title>
* |[
* gst-launch filesrc location=image.jpg ! jpegparse ! curlftpsink \
* file-name=image.jpg \
diff --git a/ext/curl/gstcurlftpsink.h b/ext/curl/gstcurlftpsink.h
index 95555eaa9..39c7def8b 100644
--- a/ext/curl/gstcurlftpsink.h
+++ b/ext/curl/gstcurlftpsink.h
@@ -48,7 +48,7 @@ struct _GstCurlFtpSink
gchar *ftp_port_arg;
gboolean epsv_mode;
gboolean tmpfile_create;
- gchar *tmpfile_name;
+ gchar *tmpfile_name;
gboolean create_dirs;
};
diff --git a/ext/curl/gstcurlsftpsink.h b/ext/curl/gstcurlsftpsink.h
index ed57fd5f4..ea77979c8 100644
--- a/ext/curl/gstcurlsftpsink.h
+++ b/ext/curl/gstcurlsftpsink.h
@@ -26,7 +26,6 @@
#include "gstcurlsshsink.h"
G_BEGIN_DECLS
-
#define GST_TYPE_CURL_SFTP_SINK \
(gst_curl_sftp_sink_get_type())
#define GST_CURL_SFTP_SINK(obj) \
@@ -37,7 +36,6 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CURL_SFTP_SINK))
#define GST_IS_CURL_SFTP_SINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CURL_SFTP_SINK))
-
typedef struct _GstCurlSftpSink GstCurlSftpSink;
typedef struct _GstCurlSftpSinkClass GstCurlSftpSinkClass;
@@ -46,7 +44,7 @@ struct _GstCurlSftpSink
{
GstCurlSshSink parent;
- /*< private >*/
+ /*< private > */
gboolean create_dirs;
};
@@ -58,5 +56,4 @@ struct _GstCurlSftpSinkClass
GType gst_curl_sftp_sink_get_type (void);
G_END_DECLS
-
#endif
diff --git a/ext/curl/gstcurlsmtpsink.c b/ext/curl/gstcurlsmtpsink.c
index c2948de06..9ee3682c8 100644
--- a/ext/curl/gstcurlsmtpsink.c
+++ b/ext/curl/gstcurlsmtpsink.c
@@ -167,7 +167,8 @@ add_final_boundary_unlocked (GstCurlSmtpSink * sink)
g_assert (array);
/* it will need up to 5 bytes if line-breaking is enabled
- * additional byte is needed for <CR> as it is not automatically added by glib */
+ * additional byte is needed for <CR> as it is not automatically added by
+ * glib */
data_out = g_malloc (6);
save = sink->base64_chunk->save;
state = sink->base64_chunk->state;
@@ -719,7 +720,8 @@ gst_curl_smtp_sink_set_transfer_options_unlocked (GstCurlBaseSink * bcsink)
return TRUE;
}
-static void // FIXME: exactly the same function as in http sink
+/* FIXME: exactly the same function as in http sink */
+static void
gst_curl_smtp_sink_set_mime_type (GstCurlBaseSink * bcsink, GstCaps * caps)
{
GstCurlSmtpSink *sink = GST_CURL_SMTP_SINK (bcsink);
@@ -769,7 +771,8 @@ gst_curl_smtp_sink_flush_data_unlocked (GstCurlBaseSink * bcsink,
}
/* it will need up to 5 bytes if line-breaking is enabled, however an
- * additional byte is needed for <CR> as it is not automatically added by glib */
+ * additional byte is needed for <CR> as it is not automatically added by
+ * glib */
data_out = g_malloc (6);
len = g_base64_encode_close (TRUE, data_out, &state, &save);
chunk->state = state;
@@ -834,8 +837,8 @@ transfer_chunk (void *curl_ptr, TransferBuffer * buffer, Base64Chunk * chunk,
gint i;
/* if line-breaking is enabled, at least: ((len / 3 + 1) * 4 + 4) / 72 + 1
- * bytes of extra space is required. However, additional <CR>'s are required,
- * thus we need ((len / 3 + 2) * 4 + 4) / 72 + 2 extra bytes.
+ * bytes of extra space is required. However, additional <CR>'s are
+ * required, thus we need ((len / 3 + 2) * 4 + 4) / 72 + 2 extra bytes.
*/
size_out = (bytes_to_send / 3 + 1) * 4 + 4 + bytes_to_send +
((bytes_to_send / 3 + 2) * 4 + 4) / 72 + 2;
diff --git a/ext/curl/gstcurlsshsink.h b/ext/curl/gstcurlsshsink.h
index c5be24641..4e502a3d3 100644
--- a/ext/curl/gstcurlsshsink.h
+++ b/ext/curl/gstcurlsshsink.h
@@ -26,7 +26,6 @@
#include "gstcurlbasesink.h"
G_BEGIN_DECLS
-
#define GST_TYPE_CURL_SSH_SINK \
(gst_curl_ssh_sink_get_type())
#define GST_CURL_SSH_SINK(obj) \
@@ -39,9 +38,9 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CURL_SSH_SINK))
#define GST_IS_CURL_SSH_SINK_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CURL_SSH_SINK))
-
/* see <curl/curl.h> */
-typedef enum {
+ typedef enum
+{
GST_CURLSSH_AUTH_NONE = CURLSSH_AUTH_NONE,
GST_CURLSSH_AUTH_PUBLICKEY = CURLSSH_AUTH_PUBLICKEY,
GST_CURLSSH_AUTH_PASSWORD = CURLSSH_AUTH_PASSWORD
@@ -55,22 +54,22 @@ struct _GstCurlSshSink
{
GstCurlBaseSink parent;
- /*< private >*/
- guint ssh_auth_type; /* for now, supporting only:
- CURLSSH_AUTH_PASSWORD (passwd auth) OR
- CURLSSH_AUTH_PUBLICKEY (pub/pvt key auth) */
-
- gchar *ssh_pub_keyfile; /* filename for the public key:
- CURLOPT_SSH_PUBLIC_KEYFILE */
- gchar *ssh_priv_keyfile; /* filename for the private key:
- CURLOPT_SSH_PRIVATE_KEYFILE */
- gchar *ssh_key_passphrase; /* passphrase for the pvt key:
- CURLOPT_KEYPASSWD */
-
- gchar *ssh_knownhosts; /* filename of the 'known_hosts' file:
- CURLOPT_SSH_KNOWN_HOSTS */
- gboolean ssh_accept_unknownhost; /* accept or reject unknown public key
- from remote host */
+ /*< private > */
+ guint ssh_auth_type; /* for now, supporting only:
+ CURLSSH_AUTH_PASSWORD (passwd auth) OR
+ CURLSSH_AUTH_PUBLICKEY (pub/pvt key auth) */
+
+ gchar *ssh_pub_keyfile; /* filename for the public key:
+ CURLOPT_SSH_PUBLIC_KEYFILE */
+ gchar *ssh_priv_keyfile; /* filename for the private key:
+ CURLOPT_SSH_PRIVATE_KEYFILE */
+ gchar *ssh_key_passphrase; /* passphrase for the pvt key:
+ CURLOPT_KEYPASSWD */
+
+ gchar *ssh_knownhosts; /* filename of the 'known_hosts' file:
+ CURLOPT_SSH_KNOWN_HOSTS */
+ gboolean ssh_accept_unknownhost; /* accept or reject unknown public key
+ from remote host */
};
struct _GstCurlSshSinkClass
@@ -78,11 +77,10 @@ struct _GstCurlSshSinkClass
GstCurlBaseSinkClass parent_class;
/* vmethods */
- gboolean (*set_options_unlocked) (GstCurlBaseSink *sink);
+ gboolean (*set_options_unlocked) (GstCurlBaseSink * sink);
};
GType gst_curl_ssh_sink_get_type (void);
G_END_DECLS
-
#endif
diff --git a/ext/curl/gstcurltlssink.c b/ext/curl/gstcurltlssink.c
index a979d1327..a603acf48 100644
--- a/ext/curl/gstcurltlssink.c
+++ b/ext/curl/gstcurltlssink.c
@@ -253,9 +253,9 @@ gst_curl_tls_sink_set_options_unlocked (GstCurlBaseSink * bcsink)
}
}
- /* note that, using ca-path can allow libcurl to make SSL-connections much more
- * efficiently than using ca-cert if the ca-cert ile
- * contains many CA certificates. */
+ /* note that, using ca-path can allow libcurl to make SSL-connections much
+ * more efficiently than using ca-cert if the ca-cert ile contains many CA
+ * certificates. */
if (sink->ca_cert != NULL && strlen (sink->ca_cert)) {
GST_DEBUG ("setting ca cert");
curl_easy_setopt (bcsink->curl, CURLOPT_CAINFO, sink->ca_cert);
View Lorry Controller Status