artox/incubator-pagespeed-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move 'type' variable to inside an #if statement

Browse Source 
removes an unused variable when compile without NGX_DEBUG, allows for
building with -Werror.
This commit is contained in:
Jeffrey Crowell
2015-03-30 11:21:17 -04:00
parent f4fd9a3f7c
commit e206e871aa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ngx_base_fetch.cc
+4 -2
View File
@@ -120,14 +120,16 @@ void NgxBaseFetch::ReadCallback(const ps_event_data& data) {
NgxBaseFetch* base_fetch = reinterpret_cast<NgxBaseFetch*>(data.sender); NgxBaseFetch* base_fetch = reinterpret_cast<NgxBaseFetch*>(data.sender);
ngx_http_request_t* r = base_fetch->request(); ngx_http_request_t* r = base_fetch->request();
bool detached = base_fetch->detached(); bool detached = base_fetch->detached();
#if (NGX_DEBUG) // `type` is unused if NGX_DEBUG isn't set, needed for -Werror.
const char* type = BaseFetchTypeToCStr(base_fetch->base_fetch_type_); const char* type = BaseFetchTypeToCStr(base_fetch->base_fetch_type_);
#endif
int refcount = base_fetch->DecrementRefCount(); int refcount = base_fetch->DecrementRefCount();
#if (NGX_DEBUG) #if (NGX_DEBUG)
ngx_log_error(NGX_LOG_DEBUG, ngx_cycle->log, 0, ngx_log_error(NGX_LOG_DEBUG, ngx_cycle->log, 0,
"pagespeed [%p] event: %c. bf:%p (%s) - refcnt:%d - det: %c", r, "pagespeed [%p] event: %c. bf:%p (%s) - refcnt:%d - det: %c", r,
data.type, base_fetch, type, refcount, detached ? 'Y': 'N'); data.type, base_fetch, type, refcount, detached ? 'Y': 'N');
#endif #endif
// If we ended up destructing the base fetch, or the request context is // If we ended up destructing the base fetch, or the request context is
// detached, skip this event. // detached, skip this event.