From b4acf4c5dc2fe84e48addcfce66d316661c51411 Mon Sep 17 00:00:00 2001 From: Jenny Shivayogi Date: Mon, 10 Jul 2023 11:20:34 -0700 Subject: [PATCH] removing tab space and resolving merge conflict --- src/java.base/unix/native/libjava/ProcessImpl_md.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/java.base/unix/native/libjava/ProcessImpl_md.c b/src/java.base/unix/native/libjava/ProcessImpl_md.c index 4ae247a3cbc02..9ed0ed30959a6 100644 --- a/src/java.base/unix/native/libjava/ProcessImpl_md.c +++ b/src/java.base/unix/native/libjava/ProcessImpl_md.c @@ -563,11 +563,7 @@ spawnChild(JNIEnv *env, jobject process, ChildStuff *c, const char *helperpath) /* write the two structs and the data buffer */ if (writeFully(c->childenv[1], (char *)&magic, sizeof(magic)) != sizeof(magic)) { // magic number first free(buf); -<<<<<<< HEAD return -1; -======= - return -1; ->>>>>>> ca127f59105d786ba85da5ca941e8d76bb030aca } #ifdef DEBUG jtregSimulateCrash(resultPid, 2); @@ -576,11 +572,7 @@ spawnChild(JNIEnv *env, jobject process, ChildStuff *c, const char *helperpath) writeFully(c->childenv[1], (char *)&sp, sizeof(sp)) != sizeof(sp) || writeFully(c->childenv[1], buf, bufsize) != bufsize) { free(buf); -<<<<<<< HEAD return -1; -======= - return -1; ->>>>>>> ca127f59105d786ba85da5ca941e8d76bb030aca } /* We're done. Let jspwanhelper know he can't expect any more data from us. */ close(c->childenv[1]);