Spelling fixes

[oweals/cde.git] / cde / lib / csa / attr.c

diff --git a/cde/lib/csa/attr.c b/cde/lib/csa/attr.c
index eaa168417e41925b4ef541ef3b4950795c61c6b5..5da400849ef0a4625fae571306722e8bf7f1be81 100644 (file)
--- a/cde/lib/csa/attr.c
+++ b/cde/lib/csa/attr.c
@@ -16,7 +16,7 @@
  * details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with these librararies and programs; if not, write
+ * License along with these libraries and programs; if not, write
  * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110-1301 USA
  */
@@ -313,8 +313,10 @@ _DtCm_check_cal_csa_attributes(
            &realnum)) != CSA_SUCCESS)
                return (stat);
 
-       if (checkattrnum == B_TRUE && realnum == 0)
+       if (checkattrnum == B_TRUE && realnum == 0) {
+               free(hattrs);
                return (CSA_E_INVALID_PARAMETER);
+       }
 
        stat = _DtCm_check_hashed_cal_attributes(fvers, hnum, hattrs,
                NULL, cname, checkreadonly, firsttime, B_TRUE);
@@ -344,8 +346,10 @@ _DtCm_check_cal_cms_attributes(
            &realnum)) != CSA_SUCCESS)
                return (stat);
 
-       if (checkattrnum == B_TRUE && realnum == 0)
+       if (checkattrnum == B_TRUE && realnum == 0) {
+               free(hattrs);
                return (CSA_E_INVALID_PARAMETER);
+       }
 
        stat = _DtCm_check_hashed_cal_attributes(fvers, hnum, hattrs,
                owner, cname, checkreadonly, firsttime, B_FALSE);
@@ -372,8 +376,10 @@ _DtCm_check_entry_attributes(
            &realnum)) != CSA_SUCCESS)
                return (stat);
 
-       if (checkattrnum == B_TRUE && realnum == 0)
+       if (checkattrnum == B_TRUE && realnum == 0) {
+               free(hattrs);
                return (CSA_E_INVALID_PARAMETER);
+       }
 
        stat = _DtCm_check_hashed_entry_attributes(fvers, hnum, hattrs,
                utype);
@@ -400,8 +406,10 @@ _DtCm_check_entry_cms_attributes(
            &realnum)) != CSA_SUCCESS)
                return (stat);
 
-       if (checkattrnum == B_TRUE && realnum == 0)
+       if (checkattrnum == B_TRUE && realnum == 0) {
+               free(hattrs);
                return (CSA_E_INVALID_PARAMETER);
+       }
 
        stat = _DtCm_check_hashed_entry_attributes(fvers, hnum, hattrs,
                utype);
@@ -1184,10 +1192,12 @@ _DtCm_free_csa_access_list(CSA_access_list alist)
                nptr = alist->next;
 
                if (alist->user) {
-                       if (alist->user->user_name)
+                       if (alist->user->user_name) {
                                free(alist->user->user_name);
-                       if (alist->user->calendar_address);
+                       }
+                       if (alist->user->calendar_address) {
                                free(alist->user->calendar_address);
+                       }
                        free(alist->user);
                }
 
@@ -1668,7 +1678,6 @@ hash_entry_attrs(
        cms_attribute   **hattrs,
        uint            *num)
 {
-       CSA_return_code         stat;
        int                     i, j, index, count = 0;
        cms_attribute           *nattrs;
        char                    *name;
@@ -1718,7 +1727,6 @@ hash_cal_attrs(
        cms_attribute   **hattrs,
        uint            *num)
 {
-       CSA_return_code         stat;
        int                     i, j, index, count = 0;
        cms_attribute           *nattrs;
        char                    *name;
@@ -1949,7 +1957,6 @@ _CheckCalendarName(char *owner, char *cname, cms_attribute_value *val)
        CSA_return_code stat;
        char            *ptr, *optr;
        char            user[BUFSIZ];
-       int             res;
        boolean_t       isuser;
 
        if (val->type != CSA_VALUE_STRING)