ORBit2 r2058 - in trunk: . src/orb/GIOP src/orb/orb-core

[tml svn gnome org]

Author: tml
Date: Thu May  8 10:16:49 2008
New Revision: 2058
URL: http://svn.gnome.org/viewvc/ORBit2?rev=2058&view=rev

Log:
2008-05-08  Tor Lillqvist  <tml novell com>

	* src/orb/orb-core/orbit-trace.c (ORBit_trace_value)
	* src/orb/GIOP/giop.c (giop_thread_free): Re-indent Michael's
	changes from yesterday. 8-column tab stops are used here.



Modified:
   trunk/ChangeLog
   trunk/src/orb/GIOP/giop.c
   trunk/src/orb/orb-core/orbit-trace.c

Modified: trunk/src/orb/GIOP/giop.c
==============================================================================
--- trunk/src/orb/GIOP/giop.c	(original)
+++ trunk/src/orb/GIOP/giop.c	Thu May  8 10:16:49 2008
@@ -326,8 +326,8 @@
 {
 	GList *l;
 
-    if (tdata == giop_main_thread)
-        giop_main_thread = NULL;
+	if (tdata == giop_main_thread)
+		giop_main_thread = NULL;
 	
 	if (giop_thread_safe ()) {
 		g_mutex_lock (giop_pool_hash_lock);
@@ -338,12 +338,12 @@
 	}
 	
 	g_list_free (tdata->keys);
-    tdata->keys = NULL;
+	tdata->keys = NULL;
 	
 	g_mutex_free (tdata->lock);
-    tdata->lock = NULL;
+	tdata->lock = NULL;
 	g_cond_free (tdata->incoming);
-    tdata->incoming = NULL;
+	tdata->incoming = NULL;
 
 #ifdef G_ENABLE_DEBUG
 	if (tdata->async_ents)
@@ -353,8 +353,8 @@
 #endif
 	if (tdata->invoke_policies) {
 		g_queue_free (tdata->invoke_policies);
-        tdata->invoke_policies = NULL;
-    }
+		tdata->invoke_policies = NULL;
+	}
 	
 	g_free (tdata);
 }

Modified: trunk/src/orb/orb-core/orbit-trace.c
==============================================================================
--- trunk/src/orb/orb-core/orbit-trace.c	(original)
+++ trunk/src/orb/orb-core/orbit-trace.c	Thu May  8 10:16:49 2008
@@ -151,28 +151,28 @@
 		if (v == NULL)
 			tprintf("(null)");
 		else {
-            static int max = -1;
+			static int max = -1;
 			const char * v = (*(const char **)*val);
-            GString *str;
+			GString *str;
 			int len = strlen (v);
 
-            if (max < 0) {
-                max = 64;
-                if (g_getenv ("ORBIT2_DEBUG_STRMAX"))
-                    max = atoi (g_getenv ("ORBIT2_DEBUG_STRMAX"));
-            }
-            str = g_string_sized_new (max + 8);
-            for (i = 0; i < MIN (max, len); i++) {
-                if (g_ascii_isprint (v[i]) && v[i] != '#')
-                    g_string_append_c (str, v[i]);
-                else {
-                    g_string_append_c (str, '#');
-                    g_string_append_printf (str, "0x%2x", v[i]);
-                    g_string_append_c (str, '#');
-                }
-            }
+			if (max < 0) {
+				max = 64;
+				if (g_getenv ("ORBIT2_DEBUG_STRMAX"))
+					max = atoi (g_getenv ("ORBIT2_DEBUG_STRMAX"));
+			}
+			str = g_string_sized_new (max + 8);
+			for (i = 0; i < MIN (max, len); i++) {
+				if (g_ascii_isprint (v[i]) && v[i] != '#')
+					g_string_append_c (str, v[i]);
+				else {
+					g_string_append_c (str, '#');
+					g_string_append_printf (str, "0x%2x", v[i]);
+					g_string_append_c (str, '#');
+				}
+			}
 			if (len > max)
-                g_string_append (str, " ...");
+				g_string_append (str, " ...");
 
 			tprintf ("'%s'", str->str);