Converted all asprintf to g_strdup_printf mainly to work with solaris platform

1 files changed, 95 insertions, 132 deletions

diff --git a/parser.c b/parser.c
index ad4adb2..06f2381 100644
--- a/parser.c
+++ b/parser.c
@@ -205,12 +205,10 @@ static int add_object_model_type (FILE *fp, char *name, char *object_type, Acces
 	      data = strip_delim (stripped_data, '.');
 	      free (stripped_data);
 	    }
-	  size = asprintf (&str_format,
-			   "[dlg%s]\ndlg%s={class=dialog, label=%s, app_name=%s}\n",
-			   data,
-			   data,
-			   name,
-			   application_name);
+	  str_format = g_strdup_printf ("[dlg%s]\ndlg%s={class=dialog, label=%s, app_name=%s}\n",
+					data, data,
+					name, application_name);
+	  size = strlen (str_format);
 	  free (data);
 	  if (dialog_name)
 	    {
@@ -232,12 +230,10 @@ static int add_object_model_type (FILE *fp, char *name, char *object_type, Acces
 	    }
 	  else
 	    data = strdup (name);
-	  size = asprintf (&str_format,
-			   "[dlg%s]\ndlg%s={class=dialog, label=%s, app_name=%s}\n",
-			   data,
-			   data,
-			   data,
-			   application_name);
+	  str_format = g_strdup_printf ("[dlg%s]\ndlg%s={class=dialog, label=%s, app_name=%s}\n",
+			   data, data,
+			   data, application_name);
+	  size = strlen (str_format);
 	  free (data);
 	  if (dialog_name)
 	    {
@@ -269,12 +265,9 @@ static int add_object_model_type (FILE *fp, char *name, char *object_type, Acces
 	      data = strip_delim (stripped_data, '.');
 	      free (stripped_data);
 	    }
-	  size = asprintf (&str_format,
-			   "[dlg%s]\ndlg%s={class=fontchooser, label=%s, app_name=%s}\n",
-			   data,
-			   data,
-			   name,
-			   application_name);
+	  str_format = g_strdup_printf ("[dlg%s]\ndlg%s={class=fontchooser, label=%s, app_name=%s}\n",
+					data, data,
+					name, application_name);
 	  free (data);
 	  if (dialog_name)
 	    {
@@ -285,7 +278,7 @@ static int add_object_model_type (FILE *fp, char *name, char *object_type, Acces
 	}
       else
 	{
-	  size = asprintf (&str_format,
+	  str_format = g_strdup_printf (
 			   "[dlg%s]\ndlg%s={class=fontchooser, label=%s, app_name=%s}\n",
 			   name,
 			   name,
@@ -301,6 +294,7 @@ static int add_object_model_type (FILE *fp, char *name, char *object_type, Acces
 #ifdef DEBUG
       printf ("%s", str_format);
 #endif
+      size = strlen (str_format);
       fwrite (str_format, sizeof (char), size, fp);
       free (str_format);
       return 0;
@@ -346,23 +340,20 @@ static int add_object_menu_type (FILE *fp, char *name, char *object_type, Access
 	      data = strip_delim (stripped_data, '(');
 	      free (stripped_data);
 	    }
-	  size = asprintf (&str_format,
-			   "mnu%s={class=menu, label=%s}\n",
-			   data,
-			   name);
+	  str_format = g_strdup_printf ("mnu%s={class=menu, label=%s}\n",
+					data, name);
 	  free (data);
 	}
       else
 	{
 	  if (strcmp (name, "") != 0)
-	    size = asprintf (&str_format,
-			     "mnu%s={class=menu, label=%s}\n",
-			     name,
-			     name);
+	    str_format = g_strdup_printf ("mnu%s={class=menu, label=%s}\n",
+					  name, name);
 	}
 #ifdef DEBUG
       printf ("%s", str_format);
 #endif
+      size = strlen (str_format);
       fwrite (str_format, sizeof (char), size, fp);
       free (str_format);
       return 0;
@@ -429,15 +420,14 @@ static int add_object_menu_type (FILE *fp, char *name, char *object_type, Access
 	      free (stripped_data);
 	    }
 	}
-      size = asprintf (&str_format,
-		       "mnu%s={class=menu_item, label=%s, parent=mnu%s}\n",
-		       data,
-		       name,
-		       parent_name);
+      str_format = g_strdup_printf ("mnu%s={class=menu_item, label=%s, parent=mnu%s}\n",
+				    data, name,
+				    parent_name);
       free (data);
 #ifdef DEBUG
       printf ("%s", str_format);
 #endif
+      size = strlen (str_format);
       fwrite (str_format, sizeof (char), size, fp);
       free (str_format);
       return 0;
@@ -484,22 +474,19 @@ static int add_object_menu_type (FILE *fp, char *name, char *object_type, Access
 	      data = strip_delim (stripped_data, '(');
 	      free (stripped_data);
 	    }
-	  size = asprintf (&str_format,
-			   "mnu%s={class=radio_menu_item, label=%s, parent=mnu%s}\n",
-			   data,
-			   name,parent_name);
+	  str_format = g_strdup_printf ("mnu%s={class=radio_menu_item, label=%s, parent=mnu%s}\n",
+					data, name, parent_name);
 	  free (data);
 	}
       else
 	{
-	  size = asprintf (&str_format,
-			   "mnu%s={class=radio_menu_item, label=%s, parent=mnu%s}\n",
-			   name,
-			   name,parent_name);
+	  str_format = g_strdup_printf ("mnu%s={class=radio_menu_item, label=%s, parent=mnu%s}\n",
+					name, name, parent_name);
 	}
 #ifdef DEBUG
       printf ("%s", str_format);
 #endif
+      size = strlen (str_format);
       fwrite (str_format, sizeof (char), size, fp);
       free (str_format);
       return 0;
@@ -546,22 +533,19 @@ static int add_object_menu_type (FILE *fp, char *name, char *object_type, Access
 	      data = strip_delim (stripped_data, '(');
 	      free (stripped_data);
 	    }
-	  size = asprintf (&str_format,
-			   "mnu%s={class=check_menu_item, label=%s, parent=mnu%s}\n",
-			   data,
-			   name,parent_name);
+	  str_format = g_strdup_printf ("mnu%s={class=check_menu_item, label=%s, parent=mnu%s}\n",
+					data, name, parent_name);
 	  free (data);
 	}
       else
 	{
-	  size = asprintf (&str_format,
-			   "mnu%s={class=check_menu_item, label=%s, parent=mnu%s}\n",
-			   name,
-			   name,parent_name);
+	  str_format = g_strdup_printf ("mnu%s={class=check_menu_item, label=%s, parent=mnu%s}\n",
+			   name, name, parent_name);
 	}
 #ifdef DEBUG
       printf ("%s", str_format);
 #endif
+      size = strlen (str_format);
       fwrite (str_format, sizeof (char), size, fp);
       free (str_format);
       return 0;
@@ -623,12 +607,10 @@ int generate_obj_info (FILE *fp, Accessible *object, char *obj_str,
 	  data = strip_delim (stripped_data, ':');
 	  free (stripped_data);
 	}
-      size = asprintf (&str_format,
-		       "%s%s={class=%s, label=%s}\n",
-		       obj_str,
-		       data,
-		       obj_type,
-		       obj_name);
+      str_format = g_strdup_printf ("%s%s={class=%s, label=%s}\n",
+				    obj_str, data,
+				    obj_type, obj_name);
+      size = strlen (str_format);
       free (data);
     }
   else if (strlen (obj_name) == 0 ||
@@ -707,14 +689,12 @@ int generate_obj_info (FILE *fp, Accessible *object, char *obj_str,
 		  data = strip_delim (stripped_data, ':');
 		  free (stripped_data);
 		}
-	      size = asprintf (&str_format,
-			       "%s%s={class=%s, label_by=%s}\n",
-			       obj_str,
-			       data,
-			       obj_type,
-			       label);
+	      str_format = g_strdup_printf ("%s%s={class=%s, label_by=%s}\n",
+					    obj_str, data,
+					    obj_type, label);
 	      free (data);
 	      SPI_freeString (label);
+	      size = strlen (str_format);
 	      fwrite (str_format, sizeof (char), size, fp);
 	      free (str_format);
 	    }
@@ -750,17 +730,15 @@ int generate_obj_info (FILE *fp, Accessible *object, char *obj_str,
 	  data = strip_delim (stripped_data, ':');
 	  free (stripped_data);
 	}
-      size = asprintf (&str_format,
-		       "%s%s={class=%s, label=%s}\n",
-		       obj_str,
-		       data,
-		       obj_type,
-		       obj_name);
+      str_format = g_strdup_printf ("%s%s={class=%s, label=%s}\n",
+				    obj_str, data,
+				    obj_type, obj_name);
       free (data);
     }
 #ifdef DEBUG
   printf ("%s", str_format);
 #endif
+  size = strlen (str_format);
   fwrite (str_format, sizeof (char), size, fp);
   free (str_format);
   return 0;
@@ -841,12 +819,10 @@ int generate_obj_info_index (FILE *fp, Accessible *object, char *obj_str,
 	  data = strip_delim (stripped_data, ':');
 	  free (stripped_data);
 	}
-      size = asprintf (&str_format,
-		       "%s%s={class=%s, label=%s}\n",
-		       obj_str,
-		       data,
-		       obj_type,
-		       obj_name);
+      str_format = g_strdup_printf ("%s%s={class=%s, label=%s}\n",
+				    obj_str, data,
+				    obj_type, obj_name);
+      size = strlen (str_format);
       free (data);
     }
   else if (strlen (obj_name) == 0 ||
@@ -858,12 +834,10 @@ int generate_obj_info_index (FILE *fp, Accessible *object, char *obj_str,
       if (AccessibleRelation_getNTargets (*relation) == -1)
 	{
 	  AccessibleRelation_unref (*relation);
-	  size = asprintf (&str_format,
-			   "%s%d={class=%s, instance_index=%d,parent=%s%s}\n",
-			   obj_str,
-			   index,
-			   obj_type,
-			   index,prefix,parent_name);
+	  str_format = g_strdup_printf ("%s%d={class=%s, instance_index=%d,parent=%s%s}\n",
+					obj_str, index,
+					obj_type, index,prefix,parent_name);
+	  size = strlen (str_format);
 	  fwrite (str_format, sizeof (char), size, fp);
 	  free (str_format);
 	  return 0;
@@ -933,14 +907,12 @@ int generate_obj_info_index (FILE *fp, Accessible *object, char *obj_str,
 		  data = strip_delim (stripped_data, ':');
 		  free (stripped_data);
 		}
-	      size = asprintf (&str_format,
-			       "%s%s={class=%s, label_by=%s}\n",
-			       obj_str,
-			       data,
-			       obj_type,
-			       label);
+	      str_format = g_strdup_printf ("%s%s={class=%s, label_by=%s}\n",
+					    obj_str, data,
+					    obj_type, label);
 	      free (data);
 	      SPI_freeString (label);
+	      size = strlen (str_format);
 	      fwrite (str_format, sizeof (char), size, fp);
 	      free (str_format);
 	    }
@@ -975,19 +947,15 @@ int generate_obj_info_index (FILE *fp, Accessible *object, char *obj_str,
 	  data = strip_delim (stripped_data, ':');
 	  free (stripped_data);
 	}
-      size = asprintf (&str_format,
-		       "%s%s={class=%s, label=%s}\n",
-		       obj_str,
-		       data,
-		       obj_type,
-		       obj_name);
+      str_format = g_strdup_printf ("%s%s={class=%s, label=%s}\n",
+				    obj_str, data,
+				    obj_type, obj_name);
       free (data);
-      
     }
-
-  fwrite (str_format, sizeof (char), size, fp);
-  free (str_format);
- return 0;
+   size = strlen (str_format);
+   fwrite (str_format, sizeof (char), size, fp);
+   free (str_format);
+   return 0;
 }
 
 static int add_object_button_type (FILE *fp, char *name, char *object_type, Accessible *object)
@@ -1076,20 +1044,19 @@ static int add_object_page_tab_type (FILE *fp, char *name, char *object_type, Ac
 		  data = strip_delim (stripped_data, '(');
 		  free (stripped_data);
 		}
-	      size = asprintf (&str_format,
-			       "ptl%s={class=page_tab_list}\n",
-			       dialog_name);
+	      str_format = g_strdup_printf ("ptl%s={class=page_tab_list}\n",
+					    dialog_name);
 	      free (data);
 	    }
 	  else
 	    {
-	    size = asprintf (&str_format,
-			     "ptl%s={class=page_tab_list}\n",
-			     dialog_name);
+	    str_format = g_strdup_printf ("ptl%s={class=page_tab_list}\n",
+					  dialog_name);
 	    }
 #ifdef DEBUG
 	  printf ("%s", str_format);
 #endif
+	  size = strlen (str_format);
 	  fwrite (str_format, sizeof (char), size, fp);
 	  free (str_format);
 	  return 0;
@@ -1098,21 +1065,20 @@ static int add_object_page_tab_type (FILE *fp, char *name, char *object_type, Ac
 	{
 	  if(dialog_name)
 	    {
-	         size = asprintf (&str_format,
-			       "ptl%s%d={class=%s, instance_index=%d, parent=%s}\n",
-			       parent_name,
-			       page_tab_list,
-			       "page_tab_list",
-			       page_tab_list,parent_name);
+	         str_format = g_strdup_printf ("ptl%s%d={class=%s, instance_index=%d, parent=%s}\n",
+					       parent_name,
+					       page_tab_list,
+					       "page_tab_list",
+					       page_tab_list,parent_name);
 	    }
 	  else 
 	    {
-	      size = asprintf (&str_format,
-			       "ptl%d={class=%s, instance_index=%d}\n",
-			       page_tab_list,
-			       "page_tab_list",
-			       page_tab_list);
+	      str_format = g_strdup_printf ("ptl%d={class=%s, instance_index=%d}\n",
+					    page_tab_list,
+					    "page_tab_list",
+					    page_tab_list);
 	    }
+	  size = strlen (str_format);
 	  fwrite (str_format, sizeof (char), size, fp);
 	  free (str_format);
 	  return 0;
@@ -1154,22 +1120,19 @@ static int add_object_page_tab_type (FILE *fp, char *name, char *object_type, Ac
 		  data = strip_delim (stripped_data, '(');
 		  free (stripped_data);
 		}
-	      size = asprintf (&str_format,
-			       "ptab%s={class=page_tab, label=%s}\n",
-			       data,
-			       name);
+	      str_format = g_strdup_printf ("ptab%s={class=page_tab, label=%s}\n",
+					    data, name);
 	      free (data);
 	    }
 	  else
 	    {
-	      size = asprintf (&str_format,
-			       "ptab%s={class=page_tab, label=%s}\n",
-			       name,
-			       name);
+	      str_format = g_strdup_printf ("ptab%s={class=page_tab, label=%s}\n",
+					    name, name);
 	    }
 #ifdef DEBUG
 	  printf ("%s", str_format);
 #endif
+	  size = strlen (str_format);
 	  fwrite (str_format, sizeof (char), size, fp);
 	  free (str_format);
 	  return 0;
@@ -1179,19 +1142,19 @@ static int add_object_page_tab_type (FILE *fp, char *name, char *object_type, Ac
 	{
 	  if(dialog_name)
 	    {
-	      size = asprintf (&str_format,
-			   "ptb%d={class=%s, instance_index=%d, parent=%s }\n",
-			   page_tab,
-			   "page_tab",
-			       page_tab,
-			       parent_name);
+	      str_format = g_strdup_printf ("ptb%d={class=%s, instance_index=%d, parent=%s }\n",
+					    page_tab,
+					    "page_tab",
+					    page_tab,
+					    parent_name);
+	      size = strlen (str_format);
 	    }
 	  else 
-	     size = asprintf (&str_format,
-			   "ptb%d={class=%s, instance_index=%d}\n",
-			   page_tab,
-			   "page_tab",
-			      page_tab);
+	     str_format = g_strdup_printf ("ptb%d={class=%s, instance_index=%d}\n",
+					   page_tab,
+					   "page_tab",
+					   page_tab);
+	  size = strlen (str_format);
 	  fwrite (str_format, sizeof (char), size, fp);
 	  free (str_format);
 	  return 0;
@@ -1655,7 +1618,7 @@ int do_action (char *name, Accessible *object, int skip)
   Accessible *parent;
   extern char *application_name;
 
-  tmp = get_current_dir_name ();
+  tmp = g_get_current_dir ();
   asprintf (&dir_name, "%s/tmpmapdir", tmp);
   free (tmp);