- a_sprintf sock_string("socket=%d", _socket);
- if (is_root_server())
- sock_string += a_sprintf("root-socket=%d", _server_socket);
-
- return a_sprintf("%s spocket: %s, %s, %s",
- (is_client()? "client" :
- (is_root_server()? "root-server" : "server") ),
- (connected()? "connected" :
- (was_connected()? "unconnected (was once)" : "never-connected") ),
- sock_string.s(),
- _where->text_form().s());
+ FUNCDEF("text_form");
+ astring to_return = is_client()? "client" :
+ (is_root_server()? "root-server" : "server");
+ to_return += " spocket: ";
+ if (connected()) {
+ to_return += "connected, ";
+ } else {
+ if (was_connected()) to_return += "unconnected (was once), ";
+ else to_return += "never-connected, ";
+ }
+ to_return += a_sprintf("socket=%u, ", _socket);
+ if (is_root_server()) {
+ to_return += a_sprintf("root-socket=%u, ", _server_socket);
+ }
+ to_return += _where->text_form().s();
+ return to_return;