projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GVariant: use GVariantTypeInfo on internal constructors
[platform/upstream/glib.git]
/
glib
/
gpattern.c
diff --git
a/glib/gpattern.c
b/glib/gpattern.c
index
7770d9c
..
aa04502
100644
(file)
--- a/
glib/gpattern.c
+++ b/
glib/gpattern.c
@@
-12,9
+12,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
*/
#include "config.h"
@@
-35,16
+33,14
@@
* @short_description: matches strings against patterns containing '*'
* (wildcard) and '?' (joker)
*
* @short_description: matches strings against patterns containing '*'
* (wildcard) and '?' (joker)
*
- * The
<function>g_pattern_match*</function>
functions match a string
+ * The
g_pattern_match*
functions match a string
* against a pattern containing '*' and '?' wildcards with similar
* semantics as the standard glob() function: '*' matches an arbitrary,
* possibly empty, string, '?' matches an arbitrary character.
*
* against a pattern containing '*' and '?' wildcards with similar
* semantics as the standard glob() function: '*' matches an arbitrary,
* possibly empty, string, '?' matches an arbitrary character.
*
- * Note that in contrast to glob(), the '/' character
- * <emphasis>can</emphasis> be matched by the wildcards, there are no
- * '[...]' character ranges and '*' and '?' can
- * <emphasis>not</emphasis> be escaped to include them literally in a
- * pattern.
+ * Note that in contrast to glob(), the '/' character can be matched by
+ * the wildcards, there are no '[...]' character ranges and '*' and '?'
+ * can not be escaped to include them literally in a pattern.
*
* When multiple strings must be matched against the same pattern, it
* is better to compile the pattern to a #GPatternSpec using
*
* When multiple strings must be matched against the same pattern, it
* is better to compile the pattern to a #GPatternSpec using
@@
-56,10
+52,9
@@
/**
* GPatternSpec:
*
/**
* GPatternSpec:
*
- * A <structname>GPatternSpec</structname> is the 'compiled' form of a
- * pattern. This structure is opaque and its fields cannot be accessed
- * directly.
- **/
+ * A GPatternSpec struct is the 'compiled' form of a pattern. This
+ * structure is opaque and its fields cannot be accessed directly.
+ */
/* keep enum and structure of gpattern.c and patterntest.c in sync */
typedef enum
/* keep enum and structure of gpattern.c and patterntest.c in sync */
typedef enum
@@
-88,8
+83,8
@@
g_pattern_ph_match (const gchar *match_pattern,
const gchar *match_string,
gboolean *wildcard_reached_p)
{
const gchar *match_string,
gboolean *wildcard_reached_p)
{
-
register
const gchar *pattern, *string;
-
register
gchar ch;
+ const gchar *pattern, *string;
+ gchar ch;
pattern = match_pattern;
string = match_string;
pattern = match_pattern;
string = match_string;
@@
-165,10
+160,9
@@
g_pattern_ph_match (const gchar *match_pattern,
* g_pattern_match:
* @pspec: a #GPatternSpec
* @string_length: the length of @string (in bytes, i.e. strlen(),
* g_pattern_match:
* @pspec: a #GPatternSpec
* @string_length: the length of @string (in bytes, i.e. strlen(),
- *
<emphasis>not</emphasis>
g_utf8_strlen())
+ *
not
g_utf8_strlen())
* @string: the UTF-8 encoded string to match
* @string: the UTF-8 encoded string to match
- * @string_reversed: the reverse of @string or %NULL
- * @Returns: %TRUE if @string matches @pspec
+ * @string_reversed: (allow-none): the reverse of @string or %NULL
*
* Matches a string against a compiled pattern. Passing the correct
* length of the string given is mandatory. The reversed string can be
*
* Matches a string against a compiled pattern. Passing the correct
* length of the string given is mandatory. The reversed string can be
@@
-184,10
+178,11
@@
g_pattern_ph_match (const gchar *match_pattern,
* constructions thereof in the various calls to g_pattern_match().
*
* Note also that the reverse of a UTF-8 encoded string can in general
* constructions thereof in the various calls to g_pattern_match().
*
* Note also that the reverse of a UTF-8 encoded string can in general
- * <emphasis>not</emphasis> be obtained by g_strreverse(). This works
- * only if the string doesn't contain any multibyte characters. GLib
- * offers the g_utf8_strreverse() function to reverse UTF-8 encoded
- * strings.
+ * not be obtained by g_strreverse(). This works only if the string
+ * does not contain any multibyte characters. GLib offers the
+ * g_utf8_strreverse() function to reverse UTF-8 encoded strings.
+ *
+ * Returns: %TRUE if @string matches @pspec
**/
gboolean
g_pattern_match (GPatternSpec *pspec,
**/
gboolean
g_pattern_match (GPatternSpec *pspec,
@@
-245,9
+240,10
@@
g_pattern_match (GPatternSpec *pspec,
/**
* g_pattern_spec_new:
* @pattern: a zero-terminated UTF-8 encoded string
/**
* g_pattern_spec_new:
* @pattern: a zero-terminated UTF-8 encoded string
- * @Returns: a newly-allocated #GPatternSpec
*
* Compiles a pattern to a #GPatternSpec.
*
* Compiles a pattern to a #GPatternSpec.
+ *
+ * Returns: a newly-allocated #GPatternSpec
**/
GPatternSpec*
g_pattern_spec_new (const gchar *pattern)
**/
GPatternSpec*
g_pattern_spec_new (const gchar *pattern)
@@
-376,10
+372,11
@@
g_pattern_spec_free (GPatternSpec *pspec)
* g_pattern_spec_equal:
* @pspec1: a #GPatternSpec
* @pspec2: another #GPatternSpec
* g_pattern_spec_equal:
* @pspec1: a #GPatternSpec
* @pspec2: another #GPatternSpec
- * @Returns: Whether the compiled patterns are equal
*
* Compares two compiled pattern specs and returns whether they will
* match the same set of strings.
*
* Compares two compiled pattern specs and returns whether they will
* match the same set of strings.
+ *
+ * Returns: Whether the compiled patterns are equal
**/
gboolean
g_pattern_spec_equal (GPatternSpec *pspec1,
**/
gboolean
g_pattern_spec_equal (GPatternSpec *pspec1,
@@
-397,11
+394,12
@@
g_pattern_spec_equal (GPatternSpec *pspec1,
* g_pattern_match_string:
* @pspec: a #GPatternSpec
* @string: the UTF-8 encoded string to match
* g_pattern_match_string:
* @pspec: a #GPatternSpec
* @string: the UTF-8 encoded string to match
- * @Returns: %TRUE if @string matches @pspec
*
* Matches a string against a compiled pattern. If the string is to be
* matched against more than one pattern, consider using
* g_pattern_match() instead while supplying the reversed string.
*
* Matches a string against a compiled pattern. If the string is to be
* matched against more than one pattern, consider using
* g_pattern_match() instead while supplying the reversed string.
+ *
+ * Returns: %TRUE if @string matches @pspec
**/
gboolean
g_pattern_match_string (GPatternSpec *pspec,
**/
gboolean
g_pattern_match_string (GPatternSpec *pspec,
@@
-417,12
+415,13
@@
g_pattern_match_string (GPatternSpec *pspec,
* g_pattern_match_simple:
* @pattern: the UTF-8 encoded pattern
* @string: the UTF-8 encoded string to match
* g_pattern_match_simple:
* @pattern: the UTF-8 encoded pattern
* @string: the UTF-8 encoded string to match
- * @Returns: %TRUE if @string matches @pspec
*
* Matches a string against a pattern given as a string. If this
* function is to be called in a loop, it's more efficient to compile
* the pattern once with g_pattern_spec_new() and call
* g_pattern_match_string() repeatedly.
*
* Matches a string against a pattern given as a string. If this
* function is to be called in a loop, it's more efficient to compile
* the pattern once with g_pattern_spec_new() and call
* g_pattern_match_string() repeatedly.
+ *
+ * Returns: %TRUE if @string matches @pspec
**/
gboolean
g_pattern_match_simple (const gchar *pattern,
**/
gboolean
g_pattern_match_simple (const gchar *pattern,