Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move WTO code from metal.c to zos.c + add shim #391

Merged
merged 9 commits into from
Aug 29, 2023

Conversation

DivergentEuropeans
Copy link
Member

@DivergentEuropeans DivergentEuropeans commented Aug 3, 2023

Proposed changes

The WTO code should be moved from metal.c to zos.c because it works in both LE C & Metal C, and can therefore be used by components like the Launcher to print to the syslog critical Zowe messages

This PR depends upon the following PRs: zowe/launcher#93
zowe/zowe-install-packaging#3553

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Change in a documentation
  • Refactor the code
  • Chore, repository cleanup, updates the dependencies.
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

PR Checklist

Please delete options that are not relevant.

  • If the changes in this PR are meant for the next release / mainline, this PR targets the "staging" branch.
  • My code follows the style guidelines of this project (see: Contributing guideline)
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • New and existing unit tests pass locally with my changes
  • video or image is included if visual changes are made
  • Relevant update to CHANGELOG.md
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works, or describe a test method below

Testing

Further comments

Signed-off-by: Leanid Astrakou <lastrakou@rocketsoftware.com>
@DivergentEuropeans
Copy link
Member Author

Have not tried removing it from metal.c completely yet, pending discussion

Copy link
Member

@1000TurquoisePogs 1000TurquoisePogs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should define these functions in the zos.h file
But also, they need different names. zis uses both zos.c and metalio.c so same name will give conflict.

For now, wtoPrintf2 and message2 are fine, and we can adjust it after discussion later.

Signed-off-by: Leanid Astrakou <lastrakou@rocketsoftware.com>
@DivergentEuropeans
Copy link
Member Author

wtoPrintf2 is already defined so using wtoPrintfMetal as a placeholder for now

h/zos.h Outdated Show resolved Hide resolved
h/zos.h Outdated Show resolved Hide resolved
@DivergentEuropeans DivergentEuropeans changed the title (Requires discussion) Move WTO code from metal.c to zos.c Move WTO code from metal.c to zos.c + add shim Aug 24, 2023
Signed-off-by: Leanid Astrakou <lastrakou@rocketsoftware.com>
h/zos.h Outdated Show resolved Hide resolved
c/zos.c Outdated Show resolved Hide resolved
Signed-off-by: Leanid Astrakou <lastrakou@rocketsoftware.com>
Copy link
Member

@1000TurquoisePogs 1000TurquoisePogs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

now lgtm

@ifakhrutdinov ifakhrutdinov self-requested a review August 29, 2023 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants