Bug 956258 - [cleanup] Patch 1/2: rename g* variables to s* ones, r=echou
Bug 956258 - [cleanup] Patch 2/2: reduce warnings and remove cancel_discovery() in SendFile(), r=echou