From 91309619b862f7b19bd52eb9fdf9d9b3f0826463 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 20 Oct 2022 19:14:53 +0200 Subject: [PATCH] Pingback: remove unused CPU/OS version detection OS specific versions part of a http query has been Ardour only. Mixbus never posted any of this information. The section was #ifdef'ed out. Removing this code for good, simplifies merges. --- gtk2_ardour/pingback.cc | 81 +---------------------------------------- 1 file changed, 2 insertions(+), 79 deletions(-) diff --git a/gtk2_ardour/pingback.cc b/gtk2_ardour/pingback.cc index d6c65f675e..8e8710ed78 100644 --- a/gtk2_ardour/pingback.cc +++ b/gtk2_ardour/pingback.cc @@ -54,84 +54,7 @@ struct ping_call { : version (v), announce_path (a) {} }; -#ifdef MIXBUS -static std::string -build_windows_query_string (ArdourCurl::HttpGet const & h) -{ - string qs; - - std::string val; - if (PBD::windows_query_registry ("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "ProductName", val)) { - char* query = h.escape (val.c_str(), strlen (val.c_str())); - url += "r="; - url += query; - url += '&'; - h.free (query); - } else { - url += "r=&"; - } - - if (PBD::windows_query_registry ("Hardware\\Description\\System\\CentralProcessor\\0", "Identifier", val)) { - // remove "Family X Model YY Stepping Z" tail - size_t cut = val.find (" Family "); - if (string::npos != cut) { - val = val.substr (0, cut); - } - const char* query = h.escape (val.c_str(), strlen (val.c_str())); - url += "m="; - url += query; - url += '&'; - h.free (query); - } else { - url += "m=&"; - } - -# if ( defined(__x86_64__) || defined(_M_X64) ) - url += "s=Windows64"; -# else - url += "s=Windows32"; -#endif - - return qs; -} - -static std::string -build_posix_query_string (ArdourCurl::HttpGet const & h) -{ - string qs; - - struct utsname utb; - - if (uname (&utb)) { - return qs; - } - - //string uts = string_compose ("%1 %2 %3 %4", utb.sysname, utb.release, utb.version, utb.machine); - string s; - char* query; - - query = h.escape (utb.sysname, strlen (utb.sysname)); - s = string_compose ("s=%1", query); - url += s; - url += '&'; - h.free (query); - - query = h.escape (utb.release, strlen (utb.release)); - s = string_compose ("r=%1", query); - url += s; - url += '&'; - h.free (query); - - - query = h.escape (utb.machine, strlen (utb.machine)); - s = string_compose ("m=%1", query); - url += s; - h.free (query); - - return qs; -} - -#else /* Ardour */ +#ifndef MIXBUS /* Ardour */ /* As of October 2022, Ardour only sends system (OS) name */ @@ -164,7 +87,7 @@ build_posix_query_string (ArdourCurl::HttpGet const & h) return qs; } -#endif /* MIXBUS */ +#endif static void* _pingback (void *arg)