Changeset 1077891a

Timestamp:

Aug 15, 2009, 7:08:18 PM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

64735f0

Parents:

e19eb97

git-author:

Anders Kaseorg <andersk@mit.edu> (08/04/09 00:39:42)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/15/09 19:08:18)

Message:

Add const qualifiers for ZNotice_t *.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• functions.c (modified) (1 diff)
• message.c (modified) (3 diffs)
• zephyr.c (modified) (12 diffs)

functions.c

@@ -1415 +1415 @@
   owl_view *v;
 #ifdef HAVE_LIBZEPHYR
-  ZNotice_t *n;
+  const ZNotice_t *n;
 #endif
 

message.c

@@ -482 +482 @@
 
 #ifdef HAVE_LIBZEPHYR
-ZNotice_t *owl_message_get_notice(owl_message *m)
+const ZNotice_t *owl_message_get_notice(owl_message *m)
 {
   return(&(m->notice));
@@ -734 +734 @@
 
 #ifdef HAVE_LIBZEPHYR
-void owl_message_create_from_znotice(owl_message *m, ZNotice_t *n)
+void owl_message_create_from_znotice(owl_message *m, const ZNotice_t *n)
 {
   struct hostent *hent;
@@ -846 +846 @@
 }
 #else
-void owl_message_create_from_znotice(owl_message *m, void *n)
+void owl_message_create_from_znotice(owl_message *m, const void *n)
 {
 }

zephyr.c

@@ -467 +467 @@
  */
 #ifdef HAVE_LIBZEPHYR
-char *owl_zephyr_get_field(ZNotice_t *n, int j)
+char *owl_zephyr_get_field(const ZNotice_t *n, int j)
 {
   int i, count, save;
@@ -499 +499 @@
 }
 
-char *owl_zephyr_get_field_as_utf8(ZNotice_t *n, int j)
+char *owl_zephyr_get_field_as_utf8(const ZNotice_t *n, int j)
 {
   int i, count, save;
@@ -545 +545 @@
 
 #ifdef HAVE_LIBZEPHYR
-int owl_zephyr_get_num_fields(ZNotice_t *n)
+int owl_zephyr_get_num_fields(const ZNotice_t *n)
 {
   int i, fields;
@@ -560 +560 @@
 }
 #else
-int owl_zephyr_get_num_fields(void *n)
+int owl_zephyr_get_num_fields(const void *n)
 {
   return(0);
@@ -570 +570 @@
  * caller must free the return
  */
-char *owl_zephyr_get_message(ZNotice_t *n, owl_message *m)
+char *owl_zephyr_get_message(const ZNotice_t *n, owl_message *m)
 {
   /* don't let ping messages have a body */
@@ -635 +635 @@
 
 #ifdef HAVE_LIBZEPHYR
-const char *owl_zephyr_get_zsig(ZNotice_t *n, int *k)
+const char *owl_zephyr_get_zsig(const ZNotice_t *n, int *k)
 {
   /* return a pointer to the zsig if there is one */
@@ -656 +656 @@
 }
 #else
-const char *owl_zephyr_get_zsig(void *n, int *k)
+const char *owl_zephyr_get_zsig(const void *n, int *k)
 {
   return("");
@@ -725 +725 @@
 
 #ifdef HAVE_LIBZEPHYR
-void owl_zephyr_handle_ack(ZNotice_t *retnotice)
+void owl_zephyr_handle_ack(const ZNotice_t *retnotice)
 {
   char *tmp;
@@ -803 +803 @@
 }
 #else
-void owl_zephyr_handle_ack(void *retnotice)
-{
-}
-#endif
-
-#ifdef HAVE_LIBZEPHYR
-int owl_zephyr_notice_is_ack(ZNotice_t *n)
+void owl_zephyr_handle_ack(const void *retnotice)
+{
+}
+#endif
+
+#ifdef HAVE_LIBZEPHYR
+int owl_zephyr_notice_is_ack(const ZNotice_t *n)
 {
   if (n->z_kind == SERVNAK || n->z_kind == SERVACK || n->z_kind == HMACK) {
@@ -818 +818 @@
 }
 #else
-int owl_zephyr_notice_is_ack(void *n)
+int owl_zephyr_notice_is_ack(const void *n)
 {
   return(0);
@@ -1076 +1076 @@
 /* return auth string */
 #ifdef HAVE_LIBZEPHYR
-const char *owl_zephyr_get_authstr(ZNotice_t *n)
+const char *owl_zephyr_get_authstr(const ZNotice_t *n)
 {
 
@@ -1092 +1092 @@
 }
 #else
-const char *owl_zephyr_get_authstr(void *n)
+const char *owl_zephyr_get_authstr(const void *n)
 {
   return("");