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

Rename error.h files #247

Merged
merged 6 commits into from Oct 31, 2017
Merged

Rename error.h files #247

merged 6 commits into from Oct 31, 2017

Conversation

vixentael
Copy link
Contributor

@vixentael vixentael commented Oct 30, 2017

Currently core has two error.h files: inside soter and inside themis folders. It might cause compiler warnings due to same names.

Moreover, objc wrapper has error.h file inside too, this cause warning while building iOS (ObjC/Swift) examples.

Previously mentioned:

Changes:

  • rename soter/error.h to soter/soter_error.h
  • remove extra includes inside soter and themis
  • rename objcthemis/serror.h to `objcthemis/serror.h

@vixentael vixentael self-assigned this Oct 30, 2017
@vixentael vixentael added core Themis Core written in C, its packages enhancement O-iOS 📱 Operating system: iOS labels Oct 30, 2017
@Lagovas
Copy link
Collaborator

Lagovas commented Oct 31, 2017

rename soter/error.h to soter/soter_error.h

I wanted to say that maybe we should rename themis/error.h to themis/themis_error.h and I remembered that this header file used in all wrappers... Did you check that soter/error.h not used anywhere in other parts of code?

rename objcthemis/serror.h to `objcthemis/serror.h

what do you think about objcthemis/soter_error.h for consistency? or if it will do the same error then objcthemis/objc_soter_error.h?

@vixentael
Copy link
Contributor Author

vixentael commented Oct 31, 2017

1

we should rename themis/error.h to themis/themis_error.h

agree, i had the same thought. renamed.

2

what do you think about objcthemis/soter_error.h for consistency?

well, i don't really like the name objcthemis/serror.h, but it's aligned with objcthemis style:

screen shot 2017-10-31 at 2 40 41 pm

3

Did you check that soter/error.h not used anywhere in other parts of code?

I hope we have tests for that :D

@Lagovas
Copy link
Collaborator

Lagovas commented Oct 31, 2017

gothemis (in *.go files) uses themis/error.h and should be renamed too

@vixentael
Copy link
Contributor Author

already did :)

thankfully, we have good tests!

@Lagovas Lagovas merged commit a64809b into master Oct 31, 2017
@vixentael vixentael deleted the vixentael/refactor-error-h branch October 31, 2017 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Themis Core written in C, its packages enhancement O-iOS 📱 Operating system: iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants