Changeset 29ff5c2 for protocols/jabber/s5bytestream.c

Timestamp:

2015-11-21T00:01:50Z (8 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feat/hip-cat

File:

• protocols/jabber/s5bytestream.c (modified) (3 diffs)

protocols/jabber/s5bytestream.c

@@ -85 +85 @@
                 return jabber_bs_abort(bt, msg ": %s", strerror(errno)); }
 
-gboolean jabber_bs_abort(struct bs_transfer *bt, char *format, ...);
+gboolean jabber_bs_abort(struct bs_transfer *bt, char *format, ...) G_GNUC_PRINTF(2, 3);
 void jabber_bs_canceled(file_transfer_t *ft, char *reason);
 void jabber_bs_free_transfer(file_transfer_t *ft);
@@ -536 +536 @@
                  * that sends atyp=0 addrlen=0 and only 6 bytes (one less than one would expect).
                  * Therefore I removed the wait for more bytes. Since we don't care about what else the proxy
-                 * is sending, it shouldnt matter */
+                 * is sending, it should not matter */
 
                 if (bt->tf->ft->sending) {
@@ -559 +559 @@
  * An intelligent sender would probably specify himself as the first streamhost and
  * a proxy as the second (Kopete and PSI are examples here). That way, a (potentially)
- * slow proxy is only used if neccessary. This of course also means, that the timeout
+ * slow proxy is only used if necessary. This of course also means, that the timeout
  * per streamhost should be kept short. If one or two firewalled adresses are specified,
  * they have to timeout first before a proxy is tried.