Changeset 181 for trunk/src

Timestamp:

Sep 23, 2008, 8:41:26 PM (16 years ago)

Author:

katerina

Message:

Remove support for obsolete version 0.8 of libprelude (ticket #120).

Location:

trunk/src

Files:

• sh_error.c (modified) (2 diffs)
• sh_getopt.c (modified) (2 diffs)
• sh_hash.c (modified) (6 diffs)
• sh_prelude.c (modified) (1 diff)
• sh_prelude_old.c (deleted)
• sh_readconf.c (modified) (3 diffs)

trunk/src/sh_error.c

@@ -799 +799 @@
 void sh_error_fixup(void)
 {
-#if defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
   if ((errFlags.preludelevel & SH_ERR_NOT)   == 0)
     sh_prelude_init();
@@ -815 +815 @@
 void sh_error_init_prelude(void)
 {
-#if defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
   if ((errFlags.preludelevel & SH_ERR_NOT)   == 0)
     sh_prelude_init();

trunk/src/sh_getopt.c

@@ -276 +276 @@
     HAS_ARG_NO, 
     sh_getopt_version },
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
   /* need to skip over these */
   { N_("prelude"),  
@@ -373 +373 @@
 #ifdef HAVE_LIBPRELUDE
   if (num > 0) fputc ('\n', stdout); ++num;
-#ifdef HAVE_LIBPRELUDE_8
-  fputs (_(" prelude (0.8)"), stdout);
-#else
-  fputs (_(" prelude (0.9+)"), stdout);
-#endif
+  fputs (_(" prelude (0.9.6+)"), stdout);
 #endif
 

trunk/src/sh_hash.c

@@ -2441 +2441 @@
    * also report device for prelude
    */
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
   if (is_new)
     format = _("dev_new=\"%lu,%lu\" ");
@@ -2609 +2609 @@
    * also report device for prelude
    */
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
   if (is_new)
     format = _("dev_new=<%lu,%lu>, ");
@@ -3062 +3062 @@
 
       if (   ((modi_mask & MODI_MOD) != 0)
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
              || ((modi_mask & MODI_USR) != 0)
              || ((modi_mask & MODI_GRP) != 0)
@@ -3211 +3211 @@
        * also report device for prelude
        */
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
       if ((modi_mask & MODI_INO) != 0)
         {
@@ -3234 +3234 @@
 
       if (   ((modi_mask & MODI_USR) != 0)
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
           || ((modi_mask & MODI_MOD) != 0)
 #endif
@@ -3262 +3262 @@
 
       if (   ((modi_mask & MODI_GRP) != 0)
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
           || ((modi_mask & MODI_MOD) != 0)
 #endif

trunk/src/sh_prelude.c

@@ -62 +62 @@
 char ** sh_argv_store;
 
-#if defined(HAVE_LIBPRELUDE) && defined(HAVE_LIBPRELUDE_9)
+#if defined(HAVE_LIBPRELUDE)
 
 

trunk/src/sh_readconf.c

@@ -48 +48 @@
 #endif
 
-#ifdef HAVE_LIBPRELUDE_9
+#ifdef HAVE_LIBPRELUDE
 #include "sh_prelude.h"
 #endif
@@ -1053 +1053 @@
   { N_("preludeclass"),      SH_SECTION_LOG,   SH_SECTION_NONE, 
     sh_error_prelude_mask },
-#ifdef HAVE_LIBPRELUDE_9
   { N_("preludeprofile"),    SH_SECTION_MISC,  SH_SECTION_NONE,
     sh_prelude_set_profile },
@@ -1064 +1063 @@
   { N_("preludemaptohigh"),    SH_SECTION_MISC,  SH_SECTION_NONE,
     sh_prelude_map_high },
-#endif
 #endif