summaryrefslogtreecommitdiff
path: root/sanei/sanei_config.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-05-18 07:43:35 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-05-18 07:43:35 +0200
commit9f8889f928ce86ba4a78659d378c6ba29bc9f735 (patch)
treec9567cb0d015b68ce3da8d03472b6443f1cb1ca9 /sanei/sanei_config.c
parent446e9454b8cbe5b689149415d11d36e88442ca88 (diff)
parent154785ab2d5df7ddc8c2cf813b773c340e5e2aea (diff)
Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1
Diffstat (limited to 'sanei/sanei_config.c')
-rw-r--r--sanei/sanei_config.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sanei/sanei_config.c b/sanei/sanei_config.c
index 0eaee9a..07c85c9 100644
--- a/sanei/sanei_config.c
+++ b/sanei/sanei_config.c
@@ -13,9 +13,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
As a special exception, the authors of SANE give permission for
additional uses of the libraries contained in this release of SANE.
@@ -239,7 +237,8 @@ sanei_config_read (char *str, int n, FILE *stream)
SANE_Status
sanei_configure_attach (const char *config_file, SANEI_Config * config,
SANE_Status (*attach) (SANEI_Config * config,
- const char *devname))
+ const char *devname, void *data),
+ void *data)
{
SANE_Char line[PATH_MAX];
SANE_Char *token, *string;
@@ -443,7 +442,7 @@ sanei_configure_attach (const char *config_file, SANEI_Config * config,
DBG (3, "sanei_configure_attach: trying to attach with '%s'\n",
lp2);
if(attach!=NULL)
- attach (config, lp2);
+ attach (config, lp2, data);
}
}