From 3bb5e0581a076e5c754470f4d44979ad0cff8bc1 Mon Sep 17 00:00:00 2001
From: David Reiss <dreiss@apache.org>
Date: Mon, 25 Jan 2010 19:31:31 +0000
Subject: [PATCH] THRIFT-683. Remove profanity

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@902941 13f79535-47bb-0310-9956-ffa450edef68
---
 compiler/cpp/src/main.cc                    | 2 +-
 lib/cpp/src/concurrency/Util.h              | 2 +-
 lib/cpp/src/protocol/TProtocolException.h   | 2 +-
 lib/cpp/src/server/TNonblockingServer.cpp   | 6 +++---
 lib/cpp/src/transport/TTransportException.h | 2 +-
 lib/php/src/transport/TSocketPool.php       | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/compiler/cpp/src/main.cc b/compiler/cpp/src/main.cc
index 7eb4801a..507aaeeb 100644
--- a/compiler/cpp/src/main.cc
+++ b/compiler/cpp/src/main.cc
@@ -652,7 +652,7 @@ void usage() {
  * wouldn't need runtime type information and all that jazz. But then we
  * decided to add constants, and all of a sudden that means runtime type
  * validation and inference, except the "runtime" is the code generator
- * runtime. Shit. I've been had.
+ * runtime.
  */
 void validate_const_rec(std::string name, t_type* type, t_const_value* value) {
   if (type->is_void()) {
diff --git a/lib/cpp/src/concurrency/Util.h b/lib/cpp/src/concurrency/Util.h
index 25fcc208..4630dbb1 100644
--- a/lib/cpp/src/concurrency/Util.h
+++ b/lib/cpp/src/concurrency/Util.h
@@ -35,7 +35,7 @@ namespace apache { namespace thrift { namespace concurrency {
  * and other common platform-dependent concurrency operations.
  * It should not be included in API headers for other concurrency library
  * headers, since it will, by definition, pull in all sorts of horrid
- * platform dependent crap.  Rather it should be inluded directly in
+ * platform dependent stuff.  Rather it should be inluded directly in
  * concurrency library implementation source.
  *
  * @version $Id:$
diff --git a/lib/cpp/src/protocol/TProtocolException.h b/lib/cpp/src/protocol/TProtocolException.h
index 33011b37..a03d3c8c 100644
--- a/lib/cpp/src/protocol/TProtocolException.h
+++ b/lib/cpp/src/protocol/TProtocolException.h
@@ -27,7 +27,7 @@ namespace apache { namespace thrift { namespace protocol {
 /**
  * Class to encapsulate all the possible types of protocol errors that may
  * occur in various protocol systems. This provides a sort of generic
- * wrapper around the shitty UNIX E_ error codes that lets a common code
+ * wrapper around the vague UNIX E_ error codes that lets a common code
  * base of error handling to be used for various types of protocols, i.e.
  * pipes etc.
  *
diff --git a/lib/cpp/src/server/TNonblockingServer.cpp b/lib/cpp/src/server/TNonblockingServer.cpp
index 10764550..5375387a 100644
--- a/lib/cpp/src/server/TNonblockingServer.cpp
+++ b/lib/cpp/src/server/TNonblockingServer.cpp
@@ -213,7 +213,7 @@ void TConnection::workSocket() {
     return;
 
   default:
-    GlobalOutput.printf("Shit Got Ill. Socket State %d", socketState_);
+    GlobalOutput.printf("Unexpected Socket State %d", socketState_);
     assert(0);
   }
 }
@@ -426,7 +426,7 @@ void TConnection::transition() {
     return;
 
   default:
-    GlobalOutput.printf("Totally Fucked. Application State %d", appState_);
+    GlobalOutput.printf("Unexpected Application State %d", appState_);
     assert(0);
   }
 }
@@ -557,7 +557,7 @@ void TNonblockingServer::returnConnection(TConnection* connection) {
  * connections on fd and assign TConnection objects to handle those requests.
  */
 void TNonblockingServer::handleEvent(int fd, short which) {
-  // Make sure that libevent didn't fuck up the socket handles
+  // Make sure that libevent didn't mess up the socket handles
   assert(fd == serverSocket_);
 
   // Server socket accepted a new connection
diff --git a/lib/cpp/src/transport/TTransportException.h b/lib/cpp/src/transport/TTransportException.h
index 330785ce..a3ad02b1 100644
--- a/lib/cpp/src/transport/TTransportException.h
+++ b/lib/cpp/src/transport/TTransportException.h
@@ -28,7 +28,7 @@ namespace apache { namespace thrift { namespace transport {
 /**
  * Class to encapsulate all the possible types of transport errors that may
  * occur in various transport systems. This provides a sort of generic
- * wrapper around the shitty UNIX E_ error codes that lets a common code
+ * wrapper around the vague UNIX E_ error codes that lets a common code
  * base of error handling to be used for various types of transports, i.e.
  * pipes etc.
  *
diff --git a/lib/php/src/transport/TSocketPool.php b/lib/php/src/transport/TSocketPool.php
index 7f1157cb..1421a650 100644
--- a/lib/php/src/transport/TSocketPool.php
+++ b/lib/php/src/transport/TSocketPool.php
@@ -278,7 +278,7 @@ class TSocketPool extends TSocket {
       }
     }
 
-    // Holy shit we failed them all. The system is totally ill!
+    // Oh no; we failed them all. The system is totally ill!
     $error = 'TSocketPool: All hosts in pool are down. ';
     $hosts = array();
     foreach ($this->servers_ as $server) {
-- 
2.17.1