diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-12-06 20:11:58 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-12-06 20:11:58 +0000 |
commit | d473cdc8138214fe65e5b74221584fec8df5785a (patch) | |
tree | 2be96a2b8a327bfb001f0d441644d7d153e09862 | |
parent | 007d3565cafccaa4460dfcf0417d2b75cb438b9c (diff) | |
download | gnunet-d473cdc8138214fe65e5b74221584fec8df5785a.tar.gz gnunet-d473cdc8138214fe65e5b74221584fec8df5785a.zip |
-make mst code static, remove GNUNET_SERVER_ prefix
-rw-r--r-- | src/transport/gnunet-transport-wlan-helper.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/transport/gnunet-transport-wlan-helper.c b/src/transport/gnunet-transport-wlan-helper.c index cbeae3101..4a5362b32 100644 --- a/src/transport/gnunet-transport-wlan-helper.c +++ b/src/transport/gnunet-transport-wlan-helper.c | |||
@@ -453,7 +453,7 @@ struct ieee80211_radiotap_iterator | |||
453 | /** | 453 | /** |
454 | * Smallest supported message. | 454 | * Smallest supported message. |
455 | */ | 455 | */ |
456 | #define GNUNET_SERVER_MIN_BUFFER_SIZE sizeof (struct GNUNET_MessageHeader) | 456 | #define MIN_BUFFER_SIZE sizeof (struct GNUNET_MessageHeader) |
457 | 457 | ||
458 | 458 | ||
459 | /** | 459 | /** |
@@ -463,7 +463,7 @@ struct ieee80211_radiotap_iterator | |||
463 | * @param cls closure | 463 | * @param cls closure |
464 | * @param message the actual message | 464 | * @param message the actual message |
465 | */ | 465 | */ |
466 | typedef void (*GNUNET_SERVER_MessageTokenizerCallback) (void *cls, | 466 | typedef void (*MessageTokenizerCallback) (void *cls, |
467 | const struct | 467 | const struct |
468 | GNUNET_MessageHeader * | 468 | GNUNET_MessageHeader * |
469 | message); | 469 | message); |
@@ -471,13 +471,13 @@ typedef void (*GNUNET_SERVER_MessageTokenizerCallback) (void *cls, | |||
471 | /** | 471 | /** |
472 | * Handle to a message stream tokenizer. | 472 | * Handle to a message stream tokenizer. |
473 | */ | 473 | */ |
474 | struct GNUNET_SERVER_MessageStreamTokenizer | 474 | struct MessageStreamTokenizer |
475 | { | 475 | { |
476 | 476 | ||
477 | /** | 477 | /** |
478 | * Function to call on completed messages. | 478 | * Function to call on completed messages. |
479 | */ | 479 | */ |
480 | GNUNET_SERVER_MessageTokenizerCallback cb; | 480 | MessageTokenizerCallback cb; |
481 | 481 | ||
482 | /** | 482 | /** |
483 | * Closure for cb. | 483 | * Closure for cb. |
@@ -515,19 +515,19 @@ struct GNUNET_SERVER_MessageStreamTokenizer | |||
515 | * @param cb_cls closure for cb | 515 | * @param cb_cls closure for cb |
516 | * @return handle to tokenizer | 516 | * @return handle to tokenizer |
517 | */ | 517 | */ |
518 | struct GNUNET_SERVER_MessageStreamTokenizer * | 518 | static struct MessageStreamTokenizer * |
519 | GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb, | 519 | mst_create (MessageTokenizerCallback cb, |
520 | void *cb_cls) | 520 | void *cb_cls) |
521 | { | 521 | { |
522 | struct GNUNET_SERVER_MessageStreamTokenizer *ret; | 522 | struct MessageStreamTokenizer *ret; |
523 | 523 | ||
524 | ret = malloc (sizeof (struct GNUNET_SERVER_MessageStreamTokenizer)); | 524 | ret = malloc (sizeof (struct MessageStreamTokenizer)); |
525 | if (NULL == ret) | 525 | if (NULL == ret) |
526 | exit (1); | 526 | exit (1); |
527 | ret->hdr = malloc (GNUNET_SERVER_MIN_BUFFER_SIZE); | 527 | ret->hdr = malloc (MIN_BUFFER_SIZE); |
528 | if (NULL == ret->hdr) | 528 | if (NULL == ret->hdr) |
529 | exit (2); | 529 | exit (2); |
530 | ret->curr_buf = GNUNET_SERVER_MIN_BUFFER_SIZE; | 530 | ret->curr_buf = MIN_BUFFER_SIZE; |
531 | ret->cb = cb; | 531 | ret->cb = cb; |
532 | ret->cb_cls = cb_cls; | 532 | ret->cb_cls = cb_cls; |
533 | return ret; | 533 | return ret; |
@@ -544,8 +544,8 @@ GNUNET_SERVER_mst_create (GNUNET_SERVER_MessageTokenizerCallback cb, | |||
544 | * @return GNUNET_OK if we are done processing (need more data) | 544 | * @return GNUNET_OK if we are done processing (need more data) |
545 | * GNUNET_SYSERR if the data stream is corrupt | 545 | * GNUNET_SYSERR if the data stream is corrupt |
546 | */ | 546 | */ |
547 | int | 547 | static int |
548 | GNUNET_SERVER_mst_receive (struct GNUNET_SERVER_MessageStreamTokenizer *mst, | 548 | mst_receive (struct MessageStreamTokenizer *mst, |
549 | const char *buf, size_t size) | 549 | const char *buf, size_t size) |
550 | { | 550 | { |
551 | const struct GNUNET_MessageHeader *hdr; | 551 | const struct GNUNET_MessageHeader *hdr; |
@@ -680,8 +680,8 @@ do_align: | |||
680 | * | 680 | * |
681 | * @param mst tokenizer to destroy | 681 | * @param mst tokenizer to destroy |
682 | */ | 682 | */ |
683 | void | 683 | static void |
684 | GNUNET_SERVER_mst_destroy (struct GNUNET_SERVER_MessageStreamTokenizer *mst) | 684 | mst_destroy (struct MessageStreamTokenizer *mst) |
685 | { | 685 | { |
686 | free (mst->hdr); | 686 | free (mst->hdr); |
687 | free (mst); | 687 | free (mst); |
@@ -1578,7 +1578,7 @@ main (int argc, char *argv[]) | |||
1578 | fd_set wfds; | 1578 | fd_set wfds; |
1579 | int retval; | 1579 | int retval; |
1580 | int stdin_open; | 1580 | int stdin_open; |
1581 | struct GNUNET_SERVER_MessageStreamTokenizer *stdin_mst; | 1581 | struct MessageStreamTokenizer *stdin_mst; |
1582 | 1582 | ||
1583 | if (2 != argc) | 1583 | if (2 != argc) |
1584 | { | 1584 | { |
@@ -1597,7 +1597,7 @@ main (int argc, char *argv[]) | |||
1597 | 1597 | ||
1598 | dev.write_pout.size = 0; | 1598 | dev.write_pout.size = 0; |
1599 | dev.write_pout.pos = 0; | 1599 | dev.write_pout.pos = 0; |
1600 | stdin_mst = GNUNET_SERVER_mst_create (&stdin_send_hw, &dev); | 1600 | stdin_mst = mst_create (&stdin_send_hw, &dev); |
1601 | 1601 | ||
1602 | /* send mac to STDOUT first */ | 1602 | /* send mac to STDOUT first */ |
1603 | write_std.pos = 0; | 1603 | write_std.pos = 0; |
@@ -1691,7 +1691,7 @@ main (int argc, char *argv[]) | |||
1691 | /* stop reading... */ | 1691 | /* stop reading... */ |
1692 | stdin_open = 0; | 1692 | stdin_open = 0; |
1693 | } | 1693 | } |
1694 | GNUNET_SERVER_mst_receive (stdin_mst, readbuf, ret); | 1694 | mst_receive (stdin_mst, readbuf, ret); |
1695 | } | 1695 | } |
1696 | 1696 | ||
1697 | if (FD_ISSET (dev.fd_raw, &rfds)) | 1697 | if (FD_ISSET (dev.fd_raw, &rfds)) |
@@ -1724,7 +1724,7 @@ main (int argc, char *argv[]) | |||
1724 | 1724 | ||
1725 | } | 1725 | } |
1726 | /* Error handling, try to clean up a bit at least */ | 1726 | /* Error handling, try to clean up a bit at least */ |
1727 | GNUNET_SERVER_mst_destroy (stdin_mst); | 1727 | mst_destroy (stdin_mst); |
1728 | close (dev.fd_raw); | 1728 | close (dev.fd_raw); |
1729 | return 1; /* we never exit 'normally' */ | 1729 | return 1; /* we never exit 'normally' */ |
1730 | } | 1730 | } |