diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-08-04 12:44:53 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2013-08-04 12:47:36 +0200 |
| commit | 215ee22f3c0d6c45403e562fee95d809547b4302 (patch) | |
| tree | 8792783aea9b57d7822396131538167b55e0e9f2 | |
| parent | b71bdf9c357b562076f4ad21a8e52f160743ae49 (diff) | |
Prefix the reincarnation routines with reincarnation_
| -rw-r--r-- | persistent-hello.c | 6 | ||||
| -rw-r--r-- | reincarnation.c | 13 | ||||
| -rw-r--r-- | reincarnation.defs | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/persistent-hello.c b/persistent-hello.c index 6274e99..85f0335 100644 --- a/persistent-hello.c +++ b/persistent-hello.c @@ -243,7 +243,9 @@ parse_opt (int opt, char *arg, struct argp_state *state) if (reincarnation != MACH_PORT_NULL) { - error_t err = checkpoint (reincarnation, contents, contents_len); + error_t err = reincarnation_checkpoint (reincarnation, + contents, + contents_len); if (err) error (0, err, "checkpoint"); } @@ -311,7 +313,7 @@ main (int argc, char **argv) /* Get reincarnation image. */ char *image = NULL; size_t image_len = 0; - err = reincarnate (reincarnation, &image, &image_len); + err = reincarnation_reincarnate (reincarnation, &image, &image_len); if (err) error (3, err, "getting reincarnation image"); diff --git a/reincarnation.c b/reincarnation.c index f780b75..ed188fc 100644 --- a/reincarnation.c +++ b/reincarnation.c @@ -444,9 +444,9 @@ data_t stored_image; size_t stored_image_len; error_t -S_reincarnate(mach_port_t server, - data_t *image, - mach_msg_type_number_t *imageCnt) +S_reincarnation_reincarnate (mach_port_t server, + data_t *image, + mach_msg_type_number_t *imageCnt) { *image = stored_image; *imageCnt = stored_image_len; @@ -454,9 +454,9 @@ S_reincarnate(mach_port_t server, } error_t -S_checkpoint(mach_port_t server, - data_t image, - mach_msg_type_number_t imageCnt) +S_reincarnation_checkpoint (mach_port_t server, + data_t image, + mach_msg_type_number_t imageCnt) { free (stored_image); stored_image = malloc (imageCnt); @@ -467,4 +467,3 @@ S_checkpoint(mach_port_t server, stored_image_len = imageCnt; return 0; } - diff --git a/reincarnation.defs b/reincarnation.defs index cb47680..edcd053 100644 --- a/reincarnation.defs +++ b/reincarnation.defs @@ -27,10 +27,10 @@ subsystem reincarnation 36270; FILE_IMPORTS #endif -routine reincarnate ( +routine reincarnation_reincarnate ( server: mach_port_t; out image: data_t); -routine checkpoint ( +routine reincarnation_checkpoint ( server: mach_port_t; in image: data_t); |