Changeset 4291:7a9728ff6900 in roaraudio

Timestamp:

08/29/10 01:56:02 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

killed 16 useless bytes

Files:

• libroar/ltm.c (modified) (4 diffs)
• roard/req.c (modified) (2 diffs)

libroar/ltm.c

@@ -240 +240 @@
  struct roar_message mes;
  size_t needed_structlen = 0;
- uint16_t * d16;
  int64_t  * d64;
  char * buf = NULL;
@@ -264 +263 @@
 
  if ( buf == NULL ) {
-  d16 = (uint16_t*)&(mes.data);
   d64 = ( int64_t*)&(mes.data);
  } else {
-  d16 = (uint16_t*)buf;
   d64 = ( int64_t*)buf;
  }
 
- // TODO: do we need this block?
- for (i = 0; i < 8; i++) {
-  d16[i] = ROAR_NET2HOST64(d16[i]);
-  ROAR_DBG("roar_ltm_get(*): d16[i=%i]=%i", i, (unsigned int)d16[i]);
- }
-
- for (i = 2; i < mes.datalen/8; i++) {
+
+ for (i = 0; i < mes.datalen/8; i++) {
   ROAR_DBG("roar_ltm_get(*): d64[i=%i]=%lli", i, (long long int)d64[i]);
   HEXDUMP64(&(d64[i]));
@@ -285 +277 @@
  }
 
- needed_structlen = sizeof(struct roar_ltm_result) + mes.datalen - 16;
+ needed_structlen = sizeof(struct roar_ltm_result) + mes.datalen;
 
  if ( oldresult != NULL ) {
@@ -312 +304 @@
  res->nummt   = roar_ltm_numbits(mt);
 
- memcpy(res->data, &(d64[2]), mes.datalen - 16);
+ memcpy(res->data, d64, mes.datalen);
 
  if ( buf != NULL )

roard/req.c

@@ -812 +812 @@
 
     needed += mes->stream == -1 ? (mes->datalen/2) - 6 : 1;
-    needed += 2; // header
 
     ROAR_DBG("req_on_get_stream_para(client=%i, ...): data size for answer is %i 64 bit sub-packets", client, (int)needed);
@@ -831 +830 @@
     memcpy(d, mes->data, mes->datalen);
 
-    // TODO: copy requested data over
-    d64[0] = 0;
-    d64[1] = 0;
-
-    d64ptr = &(d64[2]);
+    d64ptr = d64;
 
     if ( mes->stream == -1 ) {