Suppress warning in fres_contract_id_to_string() on 64 bit system

[frescor/frsh.git] / fres / contract / fres_contract.h

diff --git a/fres/contract/fres_contract.h b/fres/contract/fres_contract.h
index 6cd91026682e925e5f0d4998dda238cc8114f915..8710cebf529551f6ed0e845fb6346df82ad8ac38 100644 (file)
--- a/fres/contract/fres_contract.h
+++ b/fres/contract/fres_contract.h
@@ -62,7 +62,11 @@
 #include <fres_contract_type.h>
 #include <fres_contract_idl.h>
 #include <forb/server_id.h>
-
+#include <stdio.h>
+#ifdef __cplusplus__
+#  define __STDC_FORMAT_MACROS
+#endif
+#include <inttypes.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -85,27 +89,38 @@ static inline int fres_contract_id_cmp(const fres_contract_id_t *a,
 
 static inline bool fres_contract_id_is_empty(const fres_contract_id_t *id)
 {
-       bool empty = true;
-       unsigned i;
-
-       for (i=0; i<sizeof(*id); i++) {
-               if (((char*)id)[i] != 0) {
-                       empty = false;
-                       break;
-               }
-       }
-       return empty;
+/*     bool empty = true; */
+/*     unsigned i; */
+
+/*     for (i=0; i<sizeof(id->byte); i++) { */
+/*             if (id->byte[i] != 0) { */
+/*                     empty = false; */
+/*                     break; */
+/*             } */
+/*     } */
+/*     return empty; */
+       return *id == 0;
 }
 
 static inline char *fres_contract_id_to_string(char *dest,
                                               const fres_contract_id_t *id,
                                               size_t n)
 {
-       return forb_server_id_to_string(dest, (forb_server_id*)id, n);
+       snprintf(dest, n, "%"PRIx64, *id);
+/*     return forb_server_id_to_string(dest, (forb_server_id*)id, n); */
+       return dest;
 }
 
 struct fres_contract *fres_contract_new(void);
 void fres_contract_destroy(struct fres_contract *contract);
+
+/** Destructor for easy use in forb_sequence_free() */
+static inline void fres_contract_ptr_destroy(struct fres_contract **p)
+{
+       fres_contract_destroy(*p);
+}
+
+
 struct fres_contract *fres_contract_duplicate(struct fres_contract *src);
 
 /** 
@@ -163,9 +178,23 @@ fres_contract_get_block(struct fres_contract *contract,
 int
 fres_contract_to_string(char *dest, size_t size, const struct fres_contract *c);
 
+/* #define FRES_C2S_FL_FMT_ONELINE */
+/* #define FRES_C2S_FL_FMT_BLOCKPERLINE */
+int
+fres_contract_to_string2(char *dest, size_t size, const struct fres_contract *c, int indent, uint32_t flags);
+
 bool
 fres_contract_get_deadline(const frsh_contract_t *contract,
                           frsh_rel_time_t       *deadline);
+bool
+fres_contract_get_budget(const frsh_contract_t *contract,
+                        frsh_rel_time_t       *budget);
+bool
+fres_contract_get_period(const frsh_contract_t *contract,
+                        frsh_rel_time_t       *period);
+frsh_contract_type_t
+fres_contract_get_type(const frsh_contract_t *contract);
+
 void
 fres_contract_print(char *prefix, const struct fres_contract *c);