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

Codechange: use std::string with network's ContentInfo #9315

Merged
merged 6 commits into from Jun 10, 2021

Conversation

@rubidium42
Copy link
Contributor

@rubidium42 rubidium42 commented May 30, 2021

Motivation / Problem

C-string to std::string conversion.

Description

Replace custom allocation of tags/dependencies arrays with vectors, use proper initializations and use std::string instead of string buffers.

Limitations

Maximum sizes for the fields are magic numbers. However, since they are only used ones as parameter to Recv_String, I'm not certain how much benefit adding some constants with those values is going to add. Then you'd need to document that it is to limit the data received from the content server, but... the only place where they are used already implies it.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')
src/network/network_content.cpp Show resolved Hide resolved
src/network/network_content.cpp Outdated Show resolved Hide resolved
src/network/network_content.cpp Outdated Show resolved Hide resolved
src/network/core/tcp_content_type.h Outdated Show resolved Hide resolved
@rubidium42 rubidium42 force-pushed the rubidium42:string_network_content branch from 7d9648e to a6fe4d7 Jun 10, 2021
@rubidium42 rubidium42 merged commit e241719 into OpenTTD:master Jun 10, 2021
13 checks passed
13 checks passed
@github-actions
Emscripten
Details
@github-actions
Commit checker
Details
@github-actions
Check preview needs update Check preview needs update
Details
@github-actions
Linux (clang, clang++, libsdl2-dev)
Details
@github-actions
Linux (gcc, g++, libsdl2-dev)
Details
@github-actions
Linux (gcc, g++, libsdl1.2-dev)
Details
@github-actions
Linux (gcc, g++, -DOPTION_DEDICATED=ON)
Details
@github-actions
Mac OS (x64, x86_64)
Details
@github-actions
Windows (windows-latest, x86)
Details
@github-actions
Windows (windows-latest, x64)
Details
@github-actions
Windows (windows-2016, x86)
Details
@github-actions
Windows (windows-2016, x64)
Details
@github-actions
Check Annotations
Details
@rubidium42 rubidium42 deleted the rubidium42:string_network_content branch Jun 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants