see subject
Index: services/amfsi.c
===================================================================
--- services/amfsi.c	(revision 1792)
+++ services/amfsi.c	(working copy)
@@ -507,9 +507,10 @@
 void amf_csi_delete_assignments (struct amf_csi *csi, struct amf_su *su)
 {
 	struct amf_csi_assignment *csi_assignment;
-	ENTER ();
 	struct amf_csi_assignment **prev = &csi->assigned_csis;
 
+	ENTER ();
+
 	for (csi_assignment = csi->assigned_csis; csi_assignment != NULL;
 		csi_assignment = csi_assignment->next) {
 		if (csi_assignment->comp->su == su) {
@@ -532,7 +533,7 @@
  * 
  * @return struct amf_si*
  */
-struct amf_si *amf_si_new (struct amf_application *app, char *name)
+struct amf_si *amf_si_new (struct amf_application *app, const char *name)
 {
 	struct amf_si *tail = app->si_head;
 	struct amf_si *si = amf_calloc (1, sizeof (struct amf_si));
@@ -612,8 +613,10 @@
 struct amf_si *amf_si_deserialize (struct amf_application *app, char *buf) 
 {
 	char *tmp = buf;
-	struct amf_si *si = amf_si_new (app, "");
+	struct amf_si *si;
 
+	si = amf_si_new (app, "");
+
 	tmp = amf_deserialize_SaNameT (tmp, &si->name);
 	tmp = amf_deserialize_SaNameT (tmp, &si->saAmfSIProtectedbySG);
 	tmp = amf_deserialize_SaUint32T (tmp, &si->saAmfSIRank);
@@ -768,7 +771,7 @@
  * CSI Assignment class implementation                         *              
  ****************************************************************************/
 
-struct amf_csi_assignment *amf_csi_assignment_new (struct amf_csi *csi)
+static struct amf_csi_assignment *amf_csi_assignment_new (struct amf_csi *csi)
 {
 	struct amf_csi_assignment *csi_assignment =
 		amf_calloc (1, sizeof (struct amf_csi_assignment));
@@ -799,7 +802,7 @@
 	return buf;
 }
 
-struct amf_si_assignment *si_assignment_find (
+static struct amf_si_assignment *si_assignment_find (
 	struct amf_csi_assignment *csi_assignment)
 {
 	struct amf_comp *component;
Index: services/amf.h
===================================================================
--- services/amf.h	(revision 1819)
+++ services/amf.h	(working copy)
@@ -1043,7 +1043,7 @@
 
 /* General methods */
 extern struct amf_si *amf_si_find (struct amf_application *app, char *name);
-extern struct amf_si *amf_si_new (struct amf_application *app, char *name);
+extern struct amf_si *amf_si_new (struct amf_application *app, const char *name);
 extern void amf_si_delete (struct amf_si *si);
 extern int amf_si_calc_and_set_csi_dependency_level (struct amf_si *si);
 extern void *amf_si_serialize (struct amf_si *si, int *len);
_______________________________________________
Openais mailing list
[email protected]
https://lists.linux-foundation.org/mailman/listinfo/openais

Reply via email to