Remove `name' from lock because it duplicates its member sema's name.

diff --git a/src/threads/synch.c b/src/threads/synch.c
index 28696d471aecfc67bfffc243f3734b0dd34a09b2..85af57d63ac8c0f59f8b254c0d4db46f495d392b 100644 (file)
--- a/src/threads/synch.c
+++ b/src/threads/synch.c
@@ -162,7 +162,6 @@ lock_init (struct lock *lock, const char *name)
   ASSERT (lock != NULL);
   ASSERT (name != NULL);
 
-  strlcpy (lock->name, name, sizeof lock->name);
   lock->holder = NULL;
   sema_init (&lock->semaphore, 1, name);
 }
@@ -226,7 +225,7 @@ lock_name (const struct lock *lock)
 {
   ASSERT (lock != NULL);
 
-  return lock->name;
+  return sema_name (&lock->semaphore);
 }
 \f
 /* One semaphore in a list. */

diff --git a/src/threads/synch.h b/src/threads/synch.h
index 244479f9ae0afe236c12635bbe730cafce881d3d..ad8423891bad260215a77d0274dddfd75c960962 100644 (file)
--- a/src/threads/synch.h
+++ b/src/threads/synch.h
@@ -21,7 +21,6 @@ void sema_self_test (void);
 /* Lock. */
 struct lock 
   {
-    char name[16];              /* Name (for debugging purposes only). */
     struct thread *holder;      /* Thread holding lock (for debugging). */
     struct semaphore semaphore; /* Binary semaphore controlling access. */
   };