diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 |
| commit | 64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch) | |
| tree | 4303648095deff998ae20c2393b56db527742ac9 /sanei/sanei_config.c | |
| parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
| parent | ecaaf250cb33ff61f37a7b441f2337584a655350 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'sanei/sanei_config.c')
| -rw-r--r-- | sanei/sanei_config.c | 9 |
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); } } |