From 55c159d7eb3827a40365dbe922976d9d99ba873c Mon Sep 17 00:00:00 2001
From: "Steffen (Daode) Nurpmeso" <sdaoden@users.sf.net>
Date: Tue, 8 Jul 2014 14:42:20 +0200
Subject: [PATCH] popen.c: use NYD2 where applicable

---
 popen.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/popen.c b/popen.c
index c42f1d3c..1f85353e 100644
--- a/popen.c
+++ b/popen.c
@@ -119,7 +119,7 @@ scan_mode(char const *mode, int *omode)
    };
 
    int i;
-   NYD_ENTER;
+   NYD2_ENTER;
 
    for (i = 0; UICMP(z, i, <, NELEM(maps)); ++i)
       if (!strcmp(maps[i].mode, mode)) {
@@ -133,7 +133,7 @@ scan_mode(char const *mode, int *omode)
    *omode = 0; /* (silence CC) */
    i = -1;
 jleave:
-   NYD_LEAVE;
+   NYD2_LEAVE;
    return i;
 }
 
@@ -270,7 +270,7 @@ file_pid(FILE *fp)
 {
    int rv;
    struct fp *p;
-   NYD_ENTER;
+   NYD2_ENTER;
 
    rv = -1;
    for (p = fp_head; p; p = p->link)
@@ -278,7 +278,7 @@ file_pid(FILE *fp)
          rv = p->pid;
          break;
       }
-   NYD_LEAVE;
+   NYD2_LEAVE;
    return rv;
 }
 
@@ -380,7 +380,7 @@ safe_fopen(char const *file, char const *oflags, int *xflags)
 {
    int osflags, fd;
    FILE *fp = NULL;
-   NYD_ENTER;
+   NYD2_ENTER; /* (only for Fopen() and once in lex.c) */
 
    if (scan_mode(oflags, &osflags) < 0)
       goto jleave;
@@ -394,7 +394,7 @@ safe_fopen(char const *file, char const *oflags, int *xflags)
 
    fp = fdopen(fd, oflags);
 jleave:
-   NYD_LEAVE;
+   NYD2_LEAVE;
    return fp;
 }
 
-- 
2.11.4.GIT