Skip to content

Remove floating point from AT_CellularSMS #11396

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 5, 2019
Merged

Remove floating point from AT_CellularSMS #11396

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4df7044
Replace difftime and float literals
gpsimenos Sep 2, 2019
93cebc1
Avoid potential overflow
gpsimenos Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions features/cellular/framework/AT/AT_CellularSMS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,7 +1114,7 @@ int AT_CellularSMS::compare_time_strings(const char *time_string_1, const char *
int retVal = -2;

if (success) {
double diff = difftime(t1, t2);
time_t diff = t1 - t2;

if (diff > 0) {
retVal = 1;
Expand All @@ -1140,7 +1140,7 @@ bool AT_CellularSMS::create_time(const char *time_string, time_t *time)
&time_struct.tm_hour, &time_struct.tm_min, &time_struct.tm_sec, &sign, &gmt) == kNumberOfElements) {
*time = mktime(&time_struct);
// add timezone as seconds. gmt is in quarter of hours.
int x = 60 * 60 * gmt * 0.25;
int x = (60 / 4) * 60 * gmt;
Copy link
Collaborator

Choose a reason for hiding this comment

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

It would make sense to have macros for these magic numbers too.

Copy link
Contributor

Choose a reason for hiding this comment

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

Not convinced "60 seconds in a minute" is that magic. I don't like moving things off to macros elsewhere, unless it's a shared constant that's going to be reused.

If you want to spell it out, you could do so in the variable names themselves:

   &tz_quarter_hours

   int tz_minutes = tz_quarter_hours * 15;
   int tz_seconds = tz_minutes * 60;
   *time += tz_seconds;

(Using %c%d to grab the sign is also a bit weird - sscanf %d will handle + and - itself. Can't see a need to do it manually here).

if (sign == '+') {
*time += x;
} else {
Expand Down