Changeset 262 in openpam

Timestamp:

Jun 18, 2003, 11:41:27 AM (18 years ago)

Author:

Dag-Erling Smørgrav

Message:

Avoid side effects in macro arguments (don't I ever learn?); also
address some related style issues.

Submitted by: Dmitry V. Levin <ldv@…>

Location:

trunk/lib

Files:

• openpam_load.c (modified) (2 diffs)
• pam_end.c (modified) (2 diffs)
• pam_getenvlist.c (modified) (2 diffs)

trunk/lib/openpam_load.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_load.c#19 $
+ * $P4: //depot/projects/openpam/lib/openpam_load.c#20 $
  */
 
@@ -154 +154 @@
         openpam_destroy_chain(chain->next);
         chain->next = NULL;
-        while (chain->optc--)
+        while (chain->optc) {
+                --chain->optc;
                 FREE(chain->optv[chain->optc]);
+        }
         FREE(chain->optv);
         openpam_release_module(chain->module);
+        chain->module = NULL;
         FREE(chain);
 }

trunk/lib/pam_end.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_end.c#13 $
+ * $P4: //depot/projects/openpam/lib/pam_end.c#14 $
  */
 
@@ -69 +69 @@
 
         /* clear environment */
-        while (pamh->env_count)
-                FREE(pamh->env[--pamh->env_count]);
+        while (pamh->env_count) {
+                --pamh->env_count;
+                FREE(pamh->env[pamh->env_count]);
+        }
         FREE(pamh->env);
 

trunk/lib/pam_getenvlist.c

@@ -32 +32 @@
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_getenvlist.c#12 $
+ * $P4: //depot/projects/openpam/lib/pam_getenvlist.c#13 $
  */
 
@@ -66 +66 @@
         for (i = 0; i < pamh->env_count; ++i) {
                 if ((envlist[i] = strdup(pamh->env[i])) == NULL) {
-                        while (i)
-                                FREE(envlist[--i]);
+                        while (i) {
+                                --i;
+                                FREE(envlist[i]);
+                        }
                         FREE(envlist);
                         openpam_log(PAM_LOG_ERROR, "%s",