6633375: FileOutputStream_md.c should be merged into FileOutputStream.c

[bplb]

Merge identical Unix and Windows versions of FileOutputStream_md.c into single, common FileOutputStream.c.

---

Progress

• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• Change must be properly reviewed

Issue

• JDK-6633375: FileOutputStream_md.c should be merged into FileOutputStream.c

Reviewers

• Naoto Sato (@naotoj - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4589/head:pull/4589
$ git checkout pull/4589

Update a local copy of the PR:
$ git checkout pull/4589
$ git pull https://git.openjdk.java.net/jdk pull/4589/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4589

View PR using the GUI difftool:
$ git pr show -t 4589

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4589.diff

[bridgekeeper]

👋 Welcome back bpb! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@bplb The following label will be automatically applied to this pull request:

• core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (57ab9872)

[naotoj]

Looks good. Would you consider removing fos_fd and passing it as a jlong as suggested in the issue?

[bplb]

The fileOpen(), writeSingle(), and writeBytes() functions called here all expect to receive a field ID. This might be worth investigating as a separate issue.

[naotoj]

Fine by me.

[openjdk]

@bplb This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

6633375: FileOutputStream_md.c should be merged into FileOutputStream.c

Reviewed-by: naoto

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 44 new commits pushed to the master branch:

• c79034e: 8269303: Remove unnecessary forward declaration of PSPromotionManager in cpCache.hpp
• 42968db: 8269293: ObjectMonitor thread id fields should be 64 bits.
• 2fd7943: 8256425: Obsolete Biased Locking in JDK 18
• 595446b: 8269087: CheckSegmentedCodeCache test fails in an emulated-client VM
• 7c31903: 8267075: jcmd VM.cds should print directory of the output files
• e515873: 8269216: Useless initialization in com/sun/crypto/provider/PBES2Parameters.java
• 51d9159: 8236212: CompiledMethodLoad and CompiledMethodUnload events can be posted in START phase
• 280f2d5: 8268433: serviceability/dcmd/framework/VMVersionTest.java fails with Unable to send object throw not established PipeIO Listener Thread connection
• f375916: 8269186: [REDO] Remove CodeCache::mark_for_evol_deoptimization() method
• 7621fa3: 8268464: Remove dependancy of TestHttpsServer, HttpTransaction, HttpCallback from open/test/jdk/sun/net/www/protocol/https/ tests
• ... and 34 more: https://git.openjdk.java.net/jdk/compare/cd20c01942dd8559a31e51ef2a595c6eba44b8ad...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[bplb]

Fine by me.

Thanks!

[bplb]

/integrate

[openjdk]

Going to push as commit 3fae4b3.
Since your change was applied there have been 54 commits pushed to the master branch:

• 223759f: 8266901: Clarify the method description of Duration.toDaysPart()
• 35c4702: 8268967: Update java.security to use switch expressions
• b565459: 8267138: Stray suffix when starting gtests via GTestWrapper.java
• 1d16797: 8268469: Update java.time to use switch expressions
• ffa34ed: 8265919: RunThese30M fails "assert((!(((((JfrTraceIdBits::load(value)) & ((1 << 4) << 8)) != 0))))) failed: invariant"
• fdcae66: 8269092: Add OldObjectSampleEvent.allocationSize field
• fd43d9c: 8269225: JFR.stop misses the written info when the filename is only specified by JFR.start
• 3a8f3d6: 8269280: (bf) Replace StringBuffer in *Buffer.toString()
• c37988d: 8268276: Base64 Decoding optimization for x86 using AVX-512
• 08ee7ae: 8268855: Cleanup name handling in the Thread class and subclasses
• ... and 44 more: https://git.openjdk.java.net/jdk/compare/cd20c01942dd8559a31e51ef2a595c6eba44b8ad...master

Your commit was automatically rebased without conflicts.

[openjdk]

@bplb Pushed as commit 3fae4b3.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.