[gdm] gdm-common: Drop some dead code



commit 89fa2a2333d64261369610a55f95341e0a321093
Author: Colin Walters <walters verbum org>
Date:   Mon Dec 3 14:26:49 2012 -0500

    gdm-common: Drop some dead code
    
    -unknown-origin.[ch] according to ChangeLog was about copyright
    status...but the file clearly has a copyright header now, so
    presumably this is just long dead history.
    
    Nothing was using gdm_safe_fopen_w().  After deleting that, we're left
    with VE_IGNORE_EINTR(), which is now just in gdm-common.h
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689569

 common/Makefile.am                 |    2 -
 common/gdm-common-unknown-origin.c |   66 ------------------------------------
 common/gdm-common-unknown-origin.h |    9 -----
 common/gdm-common.h                |    7 +++-
 4 files changed, 6 insertions(+), 78 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index 8bbe9c5..1534ccb 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -67,8 +67,6 @@ libgdmcommon_la_SOURCES =	\
 	gdm-address.c		\
 	gdm-common.h		\
 	gdm-common.c		\
-	gdm-common-unknown-origin.h	\
-	gdm-common-unknown-origin.c	\
 	gdm-profile.c		\
 	gdm-profile.h		\
 	gdm-settings.c 		\
diff --git a/common/gdm-common-unknown-origin.h b/common/gdm-common-unknown-origin.h
index a87e38a..30dbcca 100644
--- a/common/gdm-common-unknown-origin.h
+++ b/common/gdm-common-unknown-origin.h
@@ -29,15 +29,6 @@
 
 G_BEGIN_DECLS
 
-#define        VE_IGNORE_EINTR(expr) \
-        do {                         \
-                errno = 0;           \
-                expr;                \
-        } while G_UNLIKELY (errno == EINTR);
-
-/* like fopen with "w" but unlinks and uses O_EXCL */
-FILE *         gdm_safe_fopen_w  (const char *file,
-                                  mode_t      perm);
 
 G_END_DECLS
 
diff --git a/common/gdm-common.h b/common/gdm-common.h
index 1a0c258..7c72990 100644
--- a/common/gdm-common.h
+++ b/common/gdm-common.h
@@ -23,8 +23,13 @@
 
 #include <glib.h>
 #include <pwd.h>
+#include <errno.h>
 
-#include "gdm-common-unknown-origin.h"
+#define        VE_IGNORE_EINTR(expr) \
+        do {                         \
+                errno = 0;           \
+                expr;                \
+        } while G_UNLIKELY (errno == EINTR);
 
 #define GDM_CUSTOM_SESSION  "custom"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]