Permalink
Browse files

easy: prefix internal waitpid_nonitr with _pink_easy

Partially fixes: #19
  • Loading branch information...
1 parent 98e1668 commit 3e28050b082d5fdf60a6f9024a6f6bf85e74906c @alip committed Apr 28, 2012
Showing with 7 additions and 7 deletions.
  1. +2 −2 include/pinktrace/easy/internal-util.h
  2. +3 −3 src/easy/pink-easy-internal.c
  3. +2 −2 src/easy/pink-easy-loop.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Ali Polatel <alip@exherbo.org>
+ * Copyright (c) 2011, 2012 Ali Polatel <alip@exherbo.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,6 @@
/** Simple waitpid() wrapper which handles EINTR **/
pid_t
-waitpid_nointr(pid_t pid, int *status);
+_pink_easy_waitpid_nointr(pid_t pid, int *status);
#endif /* !PINKTRACE_EASY_GUARD_INTERNAL_UTIL_H */
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011 Ali Polatel <alip@exherbo.org>
+ * Copyright (c) 2010, 2011, 2012 Ali Polatel <alip@exherbo.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -39,7 +39,7 @@
#include <pinktrace/easy/pink.h>
pid_t
-waitpid_nointr(pid_t pid, int *status)
+_pink_easy_waitpid_nointr(pid_t pid, int *status)
{
pid_t p;
@@ -67,7 +67,7 @@ _pink_easy_init(pink_easy_context_t *ctx, pink_easy_process_t *proc)
int status;
/* Wait for the initial sig */
- if (waitpid_nointr(proc->pid, &status) < 0) {
+ if (_pink_easy_waitpid_nointr(proc->pid, &status) < 0) {
ctx->error = PINK_EASY_ERROR_WAIT_ELDEST;
if (ctx->callback_table.error)
ctx->callback_table.error(ctx, proc->pid);
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011 Ali Polatel <alip@exherbo.org>
+ * Copyright (c) 2010, 2011, 2012 Ali Polatel <alip@exherbo.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -485,7 +485,7 @@ pink_easy_loop(pink_easy_context_t *ctx)
/* Enter the event loop */
for (;;) {
/* Wait for children */
- if ((pid = waitpid_nointr(-1, &status)) < 0) {
+ if ((pid = _pink_easy_waitpid_nointr(-1, &status)) < 0) {
if (errno == ECHILD) {
/* Received ECHILD, end of tracing */
return ctx->callback_table.end ? ctx->callback_table.end(ctx, true) : EXIT_SUCCESS;

0 comments on commit 3e28050

Please sign in to comment.