summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwcohen <wcohen>2007-05-16 13:47:23 +0000
committerwcohen <wcohen>2007-05-16 13:47:23 +0000
commit942a89cf30d66a2202cd8ad35734a54634250cdd (patch)
tree1e5e87b867233ff983b3197d2972246642fed2cc
parent4f295b51c85ada0efca7594604ada44853ac32d5 (diff)
downloadsystemtap-steved-942a89cf30d66a2202cd8ad35734a54634250cdd.tar.gz
systemtap-steved-942a89cf30d66a2202cd8ad35734a54634250cdd.tar.xz
systemtap-steved-942a89cf30d66a2202cd8ad35734a54634250cdd.zip
* control.c: Explicit type cast for picky compilers.
-rw-r--r--runtime/transport/ChangeLog4
-rw-r--r--runtime/transport/control.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/runtime/transport/ChangeLog b/runtime/transport/ChangeLog
index 49643566..41b3fa41 100644
--- a/runtime/transport/ChangeLog
+++ b/runtime/transport/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-16 Will Cohen <wcohen@redhat.com>
+
+ * control.c: Explicit type cast for picky compilers.
+
2007-05-15 Martin Hunt <hunt@redhat.com>
* control.c: Change default buffer number and size.
diff --git a/runtime/transport/control.c b/runtime/transport/control.c
index 34571e9a..dd927afd 100644
--- a/runtime/transport/control.c
+++ b/runtime/transport/control.c
@@ -139,7 +139,7 @@ static int _stp_ctl_write (int type, void *data, unsigned len)
spin_unlock_irqrestore(&_stp_pool_lock, flags);
bptr->type = type;
- memcpy(bptr->buf, data, min(len, sizeof(bptr->buf)));
+ memcpy(bptr->buf, data, min((size_t) len, sizeof(bptr->buf)));
bptr->len = len;
/* put it on the pool of ready buffers */