Re: updated: [89d3cbd] Removed unneeded var to make build process a bit cleaner
* Patrick Winnertz win...@debian.org schrieb: #include ctype.h #include stdarg.h -#include mhl/memory.h +#include ../mhl/memory.h Why did you change this ? cu -- - Enrico Weigelt== metux IT service - http://www.metux.de/ - Please visit the OpenSource QM Taskforce: http://wiki.metux.de/public/OpenSource_QM_Taskforce Patches / Fixes for a lot dozens of packages in dozens of versions: http://patches.metux.de/ - ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [2f6f6af] fixed comments to /* ... */
The following commit has been merged in the mc-4.6 branch:
commit 2f6f6af4259f261f58c4e6dfd2c4ebd0a6e1a803
Author: Enrico Weigelt, metux IT service weig...@metux.de
Date: Tue Jan 27 22:04:12 2009 +0100
fixed comments to /* ... */
diff --git a/ChangeLog b/ChangeLog
index 016036d..92ad454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-27 Enrico Weigelt, metux IT service weig...@metux.de
+
+ * mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
+
2009-01-25 Ilia Maslakov il.sm...@gmail.com
* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
diff --git a/mhl/escape.h b/mhl/escape.h
index 2533388..8366833 100644
--- a/mhl/escape.h
+++ b/mhl/escape.h
@@ -54,12 +54,12 @@ static inline char* mhl_shell_unescape_buf(char* text)
if (!text)
return NULL;
-// look for the first \ - that's quick skipover if there's nothing to
escape
+/* look for the first \ - that's quick skipover if there's nothing to
escape */
char* readptr = text;
while ((*readptr) ((*readptr)!='\\')) readptr++;
if (!(*readptr)) return text;
-// if we're here, we're standing on the first '\'
+/* if we're here, we're standing on the first '\' */
char* writeptr = readptr;
char c;
while ((c = *readptr))
@@ -97,7 +97,7 @@ static inline char* mhl_shell_unescape_buf(char* text)
(*writeptr) = c; writeptr++; break;
}
}
- else// got a normal character
+ else/* got a normal character */
{
(*writeptr) = *readptr;
writeptr++;
diff --git a/mhl/string.h b/mhl/string.h
index e3c7d2f..c50228d 100644
--- a/mhl/string.h
+++ b/mhl/string.h
@@ -16,30 +16,29 @@ static inline char * mhl_str_dup_range(const char *
s_start, const char * s_boun
static inline char* mhl_str_trim(char* str)
{
-if (!str) return NULL; // NULL string ?! bail out.
+if (!str) return NULL; /* NULL string ?! bail out. */
-// find the first non-space
+/* find the first non-space */
char* start; for (start=str; ((*str) (!isspace(*str))); str++);
-// only spaces ?
+/* only spaces ? */
if (!(*str)) { *str = 0; return str; }
-// get the size (cannot be empty - catched above)
+/* get the size (cannot be empty - catched above) */
size_t _sz = strlen(str);
-// find the proper end
+/* find the proper end */
char* end;
for (end=(str+_sz-1); ((endstr) (isspace(*end))); end--);
-end[1] = 0;// terminate, just to be sure
+end[1] = 0;/* terminate, just to be sure */
-// if we have no leading spaces, just trucate
+/* if we have no leading spaces, just trucate */
if (start==str) { end++; *end = 0; return str; }
-
-// if it' only one char, dont need memmove for that
+/* if it' only one char, dont need memmove for that */
if (start==end) { str[0]=*start; str[1]=0; return str; }
-// by here we have a (non-empty) region between start end end
+/* by here we have a (non-empty) region between start end end */
memmove(str,start,(end-start+1));
return str;
}
@@ -70,10 +69,9 @@ static inline char* __mhl_str_concat_hlp(const char* base,
...)
va_list args;
va_start(args,base);
char* a;
-// note: we use ((char*)(1)) as terminator - NULL is a valid argument !
+/* note: we use ((char*)(1)) as terminator - NULL is a valid argument ! */
while ((a = va_arg(args, char*))!=(char*)1)
{
-// printf(a=%u\n, a);
if (a)
{
arg_ptr[count] = a;
@@ -86,7 +84,7 @@ static inline char* __mhl_str_concat_hlp(const char* base,
...)
if (!count)
return mhl_str_dup();
-// now as we know how much to copy, allocate the buffer
+/* now as we know how much to copy, allocate the buffer */
char* buffer = (char*)mhl_mem_alloc_u(totalsize+2);
char* current = buffer;
int x=0;
@@ -104,8 +102,8 @@ static inline char* __mhl_str_concat_hlp(const char* base,
...)
static inline char* mhl_str_reverse(char* ptr)
{
-if (!ptr) return NULL;// missing string
-if (!(ptr[0] ptr[1])) return ptr; // empty or 1-ch string
+if (!ptr) return NULL;/* missing string */
+if (!(ptr[0] ptr[1])) return ptr; /* empty or 1-ch string */
size_t _sz = strlen(ptr);
char* start = ptr;
--
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [e34e748] Merge commit 'origin/mc-4.6'
The following commit has been merged in the master branch: commit e34e748666c0ad817013a5e8044cd1cba11f8e48 Merge: 753a663d2ddd3b91d7f7c235513dabe8016445bd 2f6f6af4259f261f58c4e6dfd2c4ebd0a6e1a803 Author: Enrico Weigelt, metux IT service weig...@metux.de Date: Tue Jan 27 22:53:12 2009 +0100 Merge commit 'origin/mc-4.6' diff --combined ChangeLog index d66c419,92ad454..9055511 --- a/ChangeLog +++ b/ChangeLog @@@ -1,3 -1,7 +1,7 @@@ + 2009-01-27 Enrico Weigelt, metux IT service weig...@metux.de + + * mhl/escape.h, mhl/string.h: fixed comments to use /* ... */ + 2009-01-25 Ilia Maslakov il.sm...@gmail.com * src/boxes.c, src/boxes.h, src/dir.c, src/dir.h: @@@ -28,19 -32,10 +32,19 @@@ - prevent . to match a newline (\n) - match from start of line and not from cursor position +2009-01-24 Enrico Weigelt, metux IT service weig...@metux.de + + * syntax/Syntax, syntax/nemerle.syntax: Added syntax rules +for Nemerle source files + +2009-01-19 Patrick Winnertz win...@debian.org + + * edit/edit.h: Add two more ints + * src/setup.c: Add keybinding to disable tab highlighting + 2009-01-18 Patrick Winnertz win...@debian.org - * edit/editdraw.c: Moved var into if clause as it's only used - there + * edit/editdraw.c: Moved var into if clause as it's only used there * edit/editlock.c: Removed unnecessary arguement to if condition * src/cmd.c: Removed unused pointer * src/hotlist.c: Removed unused function save_group @@@ -78,29 -73,7 +82,29 @@@ 2009-01-11 Patrick Winnertz win...@debian.org * syntax/pascal.syntax: Added syntax highlighting for - some delphi keywords +some delphi keywords + +2009-01-10 Enrico Weigelt, metux ITS weig...@metux.de + + * syntax/Makefile.am syntax/Syntax syntax/haskell.syntax: + added syntax definition for Haskell (taken from rhclub-tree) + * syntax: added ebuild Syntax defition (taken from rhclub-tree) + +2009-01-10 Enrico Weigelt, metux ITS weig...@metux.de + + * edit/editcmd.c: + * src/achown.c src/background.c src/boxes.c src/chmod.c: + * src/chown.c src/cmd.c src/command.c src/dir.c src/execute.c: + * src/ext.c src/file.c src/filegui.c src/find.c src/help.c: + * src/learn.c src/main.c src/panelize.c src/screen.c: + * src/selcodepage.c src/subshell.c src/tree.c src/user.c: + * src/utilunix.c src/view.c: + * vfs/cpio.c vfs/direntry.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c: + * vfs/mcfs.c vfs/sfs.c vfs/smbfs.c vfs/tar.c vfs/undelfs.c: + * vfs/utilvfs.c vfs/vfs.c: + + Changed message type codes on calls to message(), query_dialog(), + close_error_pipe() from numeric IDs to symbols D_ERROR, D_NORMAL 2008-12-18 Roland Illig roland.il...@gmx.de @@@ -278,7 -251,7 +282,7 @@@ * doc/mc.1.in: Document `fish_directory_timeout'. -2006-02-18 David Martin dmart...@excite.com +2006-02-18 David Martin dmart...@excite.com * doc/es/mc.1.in: Cleanup. Fix key naming. -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [77d2839] Merge branch '203_keypad_putty' into mc-4.6
The following commit has been merged in the mc-4.6 branch: commit 77d2839de595bde13cf61e2102243b4996b5f08f Merge: 3dd87166466dda09ea93ff13a3003e86875e70ff ea5cfade553f113a0b13ccc0146854ec78198eaf Author: Patrick Winnertz win...@debian.org Date: Tue Jan 27 22:55:16 2009 +0100 Merge branch '203_keypad_putty' into mc-4.6 -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [bef7294] Merge branch 'mc-4.6' of ssh://midnight-commander.org:2222/git/mc into mc-4.6
The following commit has been merged in the mc-4.6 branch: commit bef72946fd79f788b2eb693e9f314bbdf449c04e Merge: 77d2839de595bde13cf61e2102243b4996b5f08f 2f6f6af4259f261f58c4e6dfd2c4ebd0a6e1a803 Author: Patrick Winnertz win...@debian.org Date: Tue Jan 27 22:55:40 2009 +0100 Merge branch 'mc-4.6' of ssh://midnight-commander.org:/git/mc into mc-4.6 -- Midnight Commander Development ___ Mc-devel mailing list http://mail.gnome.org/mailman/listinfo/mc-devel
updated: [cad6ffd] Merge branch 'mc-4.6'
The following commit has been merged in the master branch:
commit cad6ffd2bb47beb653e574d69d539fc6b9ffaaf9
Merge: e34e748666c0ad817013a5e8044cd1cba11f8e48
bef72946fd79f788b2eb693e9f314bbdf449c04e
Author: Patrick Winnertz win...@debian.org
Date: Tue Jan 27 23:03:06 2009 +0100
Merge branch 'mc-4.6'
diff --combined src/main.c
index 68c9988,f323905..6ba72e0
--- a/src/main.c
+++ b/src/main.c
@@@ -425,7 -425,7 +425,7 @@@ voi
do_possible_cd (const char *new_dir)
{
if (!do_cd (new_dir, cd_exact))
- message (1, _(Warning),
+ message (D_ERROR, _(Warning),
_( The Commander can't change to the directory that \n
the subshell claims you are in. Perhaps you have \n
deleted your working directory, or given yourself \n
@@@ -471,7 -471,7 +471,7 @@@ quit_cmd_internal (int quiet
} else {
if (query_dialog
(_( The Midnight Commander ),
- _( Do you really want to quit the Midnight Commander? ), 0,
+ _( Do you really want to quit the Midnight Commander? ),
D_NORMAL,
2, _(Yes), _(No)) == 0)
q = 1;
}
@@@ -686,7 -686,7 +686,7 @@@ directory_history_list (WPanel *panel
if (_do_panel_cd (panel, s, cd_exact))
directory_history_add (panel, panel-cwd);
else
- message (1, MSG_ERROR, _(Cannot change directory));
+ message (D_ERROR, MSG_ERROR, _(Cannot change directory));
g_free (s);
}
@@@ -993,7 -993,7 +993,7 @@@ toggle_fast_reload (void
{
fast_reload = !fast_reload;
if (fast_reload_w == 0 fast_reload) {
- message (0, _( Information ),
+ message (D_NORMAL, _( Information ),
_
( Using the fast reload option may not reflect the exact \n
directory contents. In this case you'll need to do a \n
@@@ -1617,6 -1617,8 +1617,8 @@@ update_xterm_title_path (void
if (!is_printable ((unsigned char) *s))
*s = '?';
} while (*++s);
+ if (!alternate_plus_minus)
+ numeric_keypad_mode ();
fprintf (stdout, \33]0;mc - %s\7, p);
fflush (stdout);
g_free (p);
--
Midnight Commander Development
___
Mc-devel mailing list
http://mail.gnome.org/mailman/listinfo/mc-devel
