Skip to content

Fixes for uninitialized variable and always false comparsion between unsigned/signed #19

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

Open
ambakshi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for uninitialized variable and always false comparsion between unsigned/signed #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f49347
Fix always false comparison
ambakshi May 22, 2015
e948504
Fix use of uninitialized variable
ambakshi May 22, 2015
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
6 changes: 3 additions & 3 deletions daemon/RequestInFlight.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ void RequestInFlight::on_multigetBody()
{
time_t start = root["start"].asInt64();
time_t stop = root["stop"].asInt64();
size_t maxSamples = root["maxSamples"].asInt();
ssize_t maxSamples = root["maxSamples"].asInt();
if (start < 0) {
reportError("Invalid 'start' parameter", 400);
return;
Expand Down Expand Up @@ -482,10 +482,10 @@ void RequestInFlight::serveFile(std::string const &name)
}
time_t modTime = st.st_mtime;
int64_t fileSize = st.st_size;
time_t now;
time_t expires = now;
time_t now, expires;
bool cacheAll = false;
time(&now);
expires = now;
std::string etag(boost::lexical_cast<std::string>(modTime) + "_" + boost::lexical_cast<std::string>(fileSize));
// todo: maybe do some if-none-match optimization here
hdrs_["Etag"] = etag;
Expand Down