Changeset 601e813 for help.c

Timestamp:

2006-05-24T23:04:18Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

80c1e4d

Parents:

46ad029 (diff), fc630f9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

[merge] Wilmer

File:

• help.c (modified) (3 diffs)

help.c

@@ -116 +116 @@
                 h = h->next;
         }
-        if( h )
+        if( h && h->length > 0 )
         {
                 char *s = g_new( char, h->length + 1 );
@@ -123 +123 @@
                 {
                         g_free( h );
-                        *help=NULL;
-                        return( NULL );
+                        *help = NULL;
+                        return NULL;
                 }
                 mtime = stat->st_mtime;
                 
-                if( mtime > h->mtime ) {
-                        return( NULL );
-                        return( g_strdup( "Help file changed during this session. Please restart to get help back." ) );
-                }
+                if( mtime > h->mtime )
+                        return NULL;
+                
                 s[h->length] = 0;
                 if( h->fd >= 0 )
@@ -142 +141 @@
                         strncpy( s, h->offset.mem_offset, h->length );
                 }
-                return( s );
+                return s;
         }
         
-        return( NULL );
+        return NULL;
 }