← Back to branch summary

~ubuntu-branches/ubuntu/karmic/findutils/karmic

« back to all changes in this revision

Viewing changes to gnulib/lib/regexec.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-02-08 12:31:14 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20080208123114-r10wogrqrq6lck12
Tags: 4.2.32-1ubuntu1
https://launchpad.net/bugs/147911
* Merge with Debian; remaining changes:
  - debian/locate-cron.daily: Test if called by root (LP: #147911),
    add /var/lib/schroot/mount to PRUNEPATHS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnulib/lib/regexec.c
1
1
/* Extended regular expression matching and search library.
2
 
   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
2
   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
 
3
   Inc.
3
4
   This file is part of the GNU C Library.
4
5
   Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
5
6
 
6
7
   This program is free software; you can redistribute it and/or modify
7
8
   it under the terms of the GNU General Public License as published by
8
 
   the Free Software Foundation; either version 2, or (at your option)
 
9
   the Free Software Foundation; either version 3, or (at your option)
9
10
   any later version.
10
11
 
11
12
   This program is distributed in the hope that it will be useful,
2338
2339
}
2339
2340
 
2340
2341
/* Update the state_log if we need */
2341
 
re_dfastate_t *
 
2342
static re_dfastate_t *
2342
2343
internal_function
2343
2344
merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
2344
2345
                      re_dfastate_t *next_state)