[MPlayer-cvslog] r37120 - in trunk: Makefile gui/app/cfg.c gui/skin/font.c gui/skin/skin.c gui/util/misc.c gui/util/misc.h gui/util/string.c gui/util/string.h
ib
subversion at mplayerhq.hu
Thu Apr 3 11:47:41 CEST 2014
Author: ib
Date: Thu Apr 3 11:47:41 2014
New Revision: 37120
Log:
Add a file for miscellaneous auxiliary functions.
Move fgetstr() from string.c there.
Added:
trunk/gui/util/misc.c
trunk/gui/util/misc.h
Modified:
trunk/Makefile
trunk/gui/app/cfg.c
trunk/gui/skin/font.c
trunk/gui/skin/skin.c
trunk/gui/util/string.c
trunk/gui/util/string.h
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Thu Apr 3 09:55:12 2014 (r37119)
+++ trunk/Makefile Thu Apr 3 11:47:41 2014 (r37120)
@@ -523,6 +523,7 @@ SRCS_MPLAYER-$(GUI_GTK) += gui/app/
gui/ui/playbar.c \
gui/ui/render.c \
gui/ui/video.c \
+ gui/util/misc.c \
gui/wm/ws.c \
gui/wm/wsxdnd.c \
Modified: trunk/gui/app/cfg.c
==============================================================================
--- trunk/gui/app/cfg.c Thu Apr 3 09:55:12 2014 (r37119)
+++ trunk/gui/app/cfg.c Thu Apr 3 11:47:41 2014 (r37120)
@@ -24,6 +24,7 @@
#include "gui.h"
#include "gui/interface.h"
#include "gui/util/list.h"
+#include "gui/util/misc.h"
#include "gui/util/string.h"
#include "config.h"
Modified: trunk/gui/skin/font.c
==============================================================================
--- trunk/gui/skin/font.c Thu Apr 3 09:55:12 2014 (r37119)
+++ trunk/gui/skin/font.c Thu Apr 3 11:47:41 2014 (r37120)
@@ -29,6 +29,7 @@
#include "font.h"
#include "skin.h"
#include "gui/util/mem.h"
+#include "gui/util/misc.h"
#include "gui/util/string.h"
#include "mp_msg.h"
Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c Thu Apr 3 09:55:12 2014 (r37119)
+++ trunk/gui/skin/skin.c Thu Apr 3 11:47:41 2014 (r37120)
@@ -30,6 +30,7 @@
#include "gui/app/app.h"
#include "gui/app/gui.h"
#include "gui/dialog/dialog.h"
+#include "gui/util/misc.h"
#include "gui/util/string.h"
#include "help_mp.h"
Added: trunk/gui/util/misc.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/gui/util/misc.c Thu Apr 3 11:47:41 2014 (r37120)
@@ -0,0 +1,49 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+/**
+ * @file
+ * @brief Miscellaneous utilities
+ */
+
+#include <string.h>
+
+#include "misc.h"
+
+/**
+ * @brief Read characters from @a file.
+ *
+ * @param str pointer to a buffer to receive the read characters
+ * @param size number of characters read at the most (including a terminating null-character)
+ * @param file file to read from
+ *
+ * @return str (success) or NULL (error)
+ *
+ * @note Reading stops with an end-of-line character or at end of file.
+ */
+char *fgetstr(char *str, int size, FILE *file)
+{
+ char *s;
+
+ s = fgets(str, size, file);
+
+ if (s)
+ s[strcspn(s, "\n\r")] = 0;
+
+ return s;
+}
Added: trunk/gui/util/misc.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/gui/util/misc.h Thu Apr 3 11:47:41 2014 (r37120)
@@ -0,0 +1,26 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_GUI_MISC_H
+#define MPLAYER_GUI_MISC_H
+
+#include <stdio.h>
+
+char *fgetstr(char *str, int size, FILE *file);
+
+#endif /* MPLAYER_GUI_MISC_H */
Modified: trunk/gui/util/string.c
==============================================================================
--- trunk/gui/util/string.c Thu Apr 3 09:55:12 2014 (r37119)
+++ trunk/gui/util/string.c Thu Apr 3 11:47:41 2014 (r37120)
@@ -21,6 +21,7 @@
* @brief String utilities
*/
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -317,26 +318,3 @@ void setddup(char **old, const char *dir
if (*old)
sprintf(*old, "%s/%s", dir, name);
}
-
-/**
- * @brief Read characters from @a file.
- *
- * @param str pointer to a buffer to receive the read characters
- * @param size number of characters read at the most (including a terminating null-character)
- * @param file file to read from
- *
- * @return str (success) or NULL (error)
- *
- * @note Reading stops with an end-of-line character or at end of file.
- */
-char *fgetstr(char *str, int size, FILE *file)
-{
- char *s;
-
- s = fgets(str, size, file);
-
- if (s)
- s[strcspn(s, "\n\r")] = 0;
-
- return s;
-}
Modified: trunk/gui/util/string.h
==============================================================================
--- trunk/gui/util/string.h Thu Apr 3 09:55:12 2014 (r37119)
+++ trunk/gui/util/string.h Thu Apr 3 11:47:41 2014 (r37120)
@@ -20,7 +20,6 @@
#define MPLAYER_GUI_STRING_H
#include <stddef.h>
-#include <stdio.h>
/**
* @brief Wraps #cutString():
@@ -32,7 +31,6 @@
int cutInt(char *in, char sep, int num);
void cutString(char *in, char *out, char sep, int num, size_t maxout);
char *decomment(char *in);
-char *fgetstr(char *str, int size, FILE *file);
char *gstrchr(const char *str, int c);
int gstrcmp(const char *a, const char *b);
char *gstrdup(const char *str);
More information about the MPlayer-cvslog
mailing list