Changeset: b057a1aead10 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b057a1aead10
Modified Files:
clients/mapilib/mapi.c
common/stream/stream.h
gdk/gdk_atoms.c
Branch: Feb2013
Log Message:
Layout.
diffs (83 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1036,8 +1036,8 @@ static int mapi_initialized = 0;
do { \
if ((s) == NULL || mnstr_errnr(s)) { \
mapi_log_record(mid,msg); \
- mapi_log_record(mid,f); \
- close_connection(mid); \
+ mapi_log_record(mid,f); \
+ close_connection(mid); \
mapi_setError((mid), (msg), (f), MTIMEOUT); \
return (e); \
} \
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -92,9 +92,9 @@ typedef struct stream stream;
/* some os specific initialization */
stream_export int mnstr_init(void);
-/* all mnstr_readX/mnstr_writeX return
- 0 on error
- !0 on success
+/* all mnstr_readX/mnstr_writeX return
+ * 0 on error
+ * !0 on success
*/
stream_export int mnstr_readBte(stream *s, signed char *val);
stream_export int mnstr_writeBte(stream *s, signed char val);
@@ -194,24 +194,24 @@ stream_export stream *buffer_wastream(bu
stream_export buffer *mnstr_get_buffer(stream *s);
/* note, the size is fixed to 8K, you cannot simply change it to any
- value */
+ * value */
#define BLOCK (8 * 1024 - 2)
-/*
- Block stream is a stream which sends data in blocks of a known
- size (BLOCK size or dynamically changed using CHANGE_BLOCK_SIZE msg).
- A block is written once more than BLOCK size data has been written using
- the write commands or when the flush command is sent.
-
- All full blocks together with a single not full block form a major
- block. Major blocks can be used to synchronize the communication.
- Example server sends some reply, ie a major block consisting of
- various minor blocks. The header of the major block can contain
- special info which the client can interpret.
-
- Each read attempt tries to return the number of bytes. Once a lower number
- of bytes can be read the end of the major block is found. The next
- read will then start with a new major block.
+/* Block stream is a stream which sends data in blocks of a known size
+ * (BLOCK size or dynamically changed using CHANGE_BLOCK_SIZE msg).
+ *
+ * A block is written once more than BLOCK size data has been written
+ * using the write commands or when the flush command is sent.
+ *
+ * All full blocks together with a single not full block form a major
+ * block. Major blocks can be used to synchronize the communication.
+ * Example server sends some reply, ie a major block consisting of
+ * various minor blocks. The header of the major block can contain
+ * special info which the client can interpret.
+ *
+ * Each read attempt tries to return the number of bytes. Once a lower
+ * number of bytes can be read the end of the major block is
+ * found. The next read will then start with a new major block.
*/
stream_export stream *wbstream(stream *s, size_t buflen);
stream_export stream *block_stream(stream *s);
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -410,7 +410,7 @@ ATOMprint(int t, const void *p, stream *
{
int (*tostr) (str *, int *, const void *);
- if (p && (t >= 0) && (t < GDKatomcnt) && (tostr =
BATatoms[t].atomToStr)) {
+ if (p && t >= 0 && t < GDKatomcnt && (tostr = BATatoms[t].atomToStr)) {
if (t != TYPE_bat && t < TYPE_str) {
char buf[dblStrlen], *addr = buf; /* use memory
from stack */
int sz = dblStrlen, l = (*tostr) (&addr, &sz, p);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
